Merge "BUG-868: use a single version of ClassLoaderUtils"

[controller.git] / opendaylight / md-sal / forwardingrules-manager / src / main / java / org / opendaylight / controller / frm / FRMActivator.java

diff --git a/opendaylight/md-sal/forwardingrules-manager/src/main/java/org/opendaylight/controller/frm/FRMActivator.java b/opendaylight/md-sal/forwardingrules-manager/src/main/java/org/opendaylight/controller/frm/FRMActivator.java
index 929c489eaf36fa200c88a7bec70834a0fa9f2c1b..2f986ea5bcbbf83c75d81adb9a6724855641fe60 100644 (file)
--- a/opendaylight/md-sal/forwardingrules-manager/src/main/java/org/opendaylight/controller/frm/FRMActivator.java
+++ b/opendaylight/md-sal/forwardingrules-manager/src/main/java/org/opendaylight/controller/frm/FRMActivator.java
@@ -1,6 +1,6 @@
 /**
  * Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.
- * 
+ *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
@@ -24,10 +24,10 @@ public class FRMActivator extends AbstractBindingAwareProvider {
 
     private final static Logger LOG = LoggerFactory.getLogger(FRMActivator.class);
 
-    private static FlowProvider flowProvider = new FlowProvider(); 
+    private static FlowProvider flowProvider = new FlowProvider();
     private static GroupProvider groupProvider = new GroupProvider();
     private static MeterProvider meterProvider = new MeterProvider();
-    
+
     @Override
     public void onSessionInitiated(final ProviderContext session) {
         DataProviderService flowSalService = session.<DataProviderService>getSALService(DataProviderService.class);
@@ -46,7 +46,7 @@ public class FRMActivator extends AbstractBindingAwareProvider {
         FRMActivator.meterProvider.setSalMeterService(rpcMeterSalService);
         FRMActivator.meterProvider.start();
     }
-    
+
     @Override
     protected void stopImpl(final BundleContext context) {
         try {