X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fconnectionmanager%2Fimplementation%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fconnectionmanager%2Fscheme%2FSingleControllerScheme.java;h=a84a11b33614d2b7ffce0d3fba3b839fe35749f4;hb=a84d1bd3fba5d6fb7d9777e1508221e2f773e94f;hp=6afb27fb9ef5fbc5c345616c01af97f624084755;hpb=51e9be2b3aac6ea33bf21e5a3a978325d24e9e0e;p=controller.git

diff --git a/opendaylight/connectionmanager/implementation/src/main/java/org/opendaylight/controller/connectionmanager/scheme/SingleControllerScheme.java b/opendaylight/connectionmanager/implementation/src/main/java/org/opendaylight/controller/connectionmanager/scheme/SingleControllerScheme.java
index 6afb27fb9e..a84a11b336 100644
--- a/opendaylight/connectionmanager/implementation/src/main/java/org/opendaylight/controller/connectionmanager/scheme/SingleControllerScheme.java
+++ b/opendaylight/connectionmanager/implementation/src/main/java/org/opendaylight/controller/connectionmanager/scheme/SingleControllerScheme.java
@@ -6,7 +6,7 @@ import org.opendaylight.controller.sal.core.Node;
 
 class SingleControllerScheme extends AbstractScheme {
 
-    private static AbstractScheme myScheme= null;
+    private static AbstractScheme myScheme = null;
 
     protected SingleControllerScheme(IClusterGlobalServices clusterServices) {
         super(clusterServices, ConnectionMgmtScheme.SINGLE_CONTROLLER);
@@ -19,12 +19,9 @@ class SingleControllerScheme extends AbstractScheme {
         return myScheme;
     }
 
-    @SuppressWarnings("deprecation")
     @Override
     public boolean isConnectionAllowedInternal(Node node) {
-        if (nodeConnections == null) return true;
         // Lets make it simple. The Cluster Coordinator is the master
-        if (clusterServices.amICoordinator()) return true;
-        return false;
+        return clusterServices.amICoordinator();
     }
 }
\ No newline at end of file