X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fforwardingrulesmanager_mdsal%2Fopenflow%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fforwardingrulesmanager_mdsal%2Fconsumer%2Fimpl%2FFRMConsumerImpl.java;fp=opendaylight%2Fforwardingrulesmanager_mdsal%2Fopenflow%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fforwardingrulesmanager_mdsal%2Fconsumer%2Fimpl%2FFRMConsumerImpl.java;h=e26e98e4d79601b0a6ac811391caa2c7ce8092aa;hp=a72d0635b1aff68937d8a4c4ba9ba76e8348b10d;hb=83591d76828e7557ca83189f516a7834b1f17c07;hpb=070eefb2e3ade7d920ea5fe6264ac0f949dbb378

diff --git a/opendaylight/forwardingrulesmanager_mdsal/openflow/src/main/java/org/opendaylight/controller/forwardingrulesmanager_mdsal/consumer/impl/FRMConsumerImpl.java b/opendaylight/forwardingrulesmanager_mdsal/openflow/src/main/java/org/opendaylight/controller/forwardingrulesmanager_mdsal/consumer/impl/FRMConsumerImpl.java
index a72d0635b1..e26e98e4d7 100644
--- a/opendaylight/forwardingrulesmanager_mdsal/openflow/src/main/java/org/opendaylight/controller/forwardingrulesmanager_mdsal/consumer/impl/FRMConsumerImpl.java
+++ b/opendaylight/forwardingrulesmanager_mdsal/openflow/src/main/java/org/opendaylight/controller/forwardingrulesmanager_mdsal/consumer/impl/FRMConsumerImpl.java
@@ -17,7 +17,6 @@ import org.opendaylight.controller.sal.binding.api.data.DataBrokerService;
 import org.opendaylight.controller.sal.binding.api.data.DataProviderService;
 import org.opendaylight.controller.sal.core.IContainer;
 import org.opendaylight.controller.sal.utils.ServiceHelper;
-import org.opendaylight.controller.switchmanager.ISwitchManager;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.FrameworkUtil;
 import org.slf4j.Logger;
@@ -32,11 +31,10 @@ public class FRMConsumerImpl extends AbstractBindingAwareProvider implements Com
     private GroupConsumerImpl groupImplRef;
     private static DataProviderService dataProviderService;
 
-    private static IClusterContainerServices clusterContainerService = null;
-    private static ISwitchManager switchManager;
-    private static IContainer container;
-
-    @Override
+	private static IClusterContainerServices clusterContainerService = null;
+	private static IContainer container;
+	
+	@Override
     public void onSessionInitiated(ProviderContext session) {
 
         FRMConsumerImpl.p_session = session;
@@ -89,14 +87,6 @@ public class FRMConsumerImpl extends AbstractBindingAwareProvider implements Com
         FRMConsumerImpl.clusterContainerService = clusterContainerService;
     }
 
-    public static ISwitchManager getSwitchManager() {
-        return switchManager;
-    }
-
-    public static void setSwitchManager(ISwitchManager switchManager) {
-        FRMConsumerImpl.switchManager = switchManager;
-    }
-
     public static IContainer getContainer() {
         return container;
     }
@@ -109,41 +99,35 @@ public class FRMConsumerImpl extends AbstractBindingAwareProvider implements Com
         BundleContext bundleContext = FrameworkUtil.getBundle(this.getClass()).getBundleContext();
         bundleContext.registerService(CommandProvider.class.getName(), this, null);
     }
-
-    private boolean getDependentModule() {
-        do {
-            clusterContainerService = (IClusterContainerServices) ServiceHelper.getGlobalInstance(
-                    IClusterContainerServices.class, this);
-            try {
-                Thread.sleep(4);
-            } catch (InterruptedException e) {
-                // TODO Auto-generated catch block
-                e.printStackTrace();
-            }
-        } while (clusterContainerService == null);
-
-        do {
-
-            container = (IContainer) ServiceHelper.getGlobalInstance(IContainer.class, this);
-            try {
-                Thread.sleep(5);
-            } catch (InterruptedException e) {
-                // TODO Auto-generated catch block
-                e.printStackTrace();
-            }
-        } while (container == null);
-
-        do {
-            switchManager = (ISwitchManager) ServiceHelper.getInstance(ISwitchManager.class, container.getName(), this);
-            try {
-                Thread.sleep(5);
-            } catch (InterruptedException e) {
-                // TODO Auto-generated catch block
-                e.printStackTrace();
-            }
-        } while (null == switchManager);
+	
+	private boolean getDependentModule() {
+	    do {
+        clusterContainerService = (IClusterContainerServices) ServiceHelper.getGlobalInstance(IClusterContainerServices.class, this);
+        try {
+            Thread.sleep(4);
+        } catch (InterruptedException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+	    } while(clusterContainerService == null);
+	    
+	    do {
+	        
+	    
+        container = (IContainer) ServiceHelper.getGlobalInstance(IContainer.class, this);
+        try {
+            Thread.sleep(5);
+        } catch (InterruptedException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+	    } while (container == null);
+	    
+	   
         return true;
-    }
+	}
+
+	
 
     public static DataProviderService getDataProviderService() {
         return dataProviderService;
@@ -154,8 +138,9 @@ public class FRMConsumerImpl extends AbstractBindingAwareProvider implements Com
     }
 
     public GroupConsumerImpl getGroupImplRef() {
-        return groupImplRef;
+	return groupImplRef;
     }
+		
 
     public static ProviderContext getProviderSession() {
         return p_session;