Using ClusterService in ClusterCommunicationManager (NPE fix)

@@ -8,7 +8,7 @@ import org.slf4j.LoggerFactory;
 /**
 /**
  * Test to measure Messaging performance.
  * Test to measure Messaging performance.
  */
  */
-    public class SimpleNettyServer {
+    public final class SimpleNettyServer {
         private static Logger log = LoggerFactory.getLogger(IOLoopTestServer.class);
         private static Logger log = LoggerFactory.getLogger(IOLoopTestServer.class);
 
 
             private SimpleNettyServer() {}
             private SimpleNettyServer() {}

@@ -12,7 +12,10 @@ import java.util.TimerTask;
 import org.apache.felix.scr.annotations.Activate;
 import org.apache.felix.scr.annotations.Activate;
 import org.apache.felix.scr.annotations.Component;
 import org.apache.felix.scr.annotations.Component;
 import org.apache.felix.scr.annotations.Deactivate;
 import org.apache.felix.scr.annotations.Deactivate;
+import org.apache.felix.scr.annotations.Reference;
+import org.apache.felix.scr.annotations.ReferenceCardinality;
 import org.apache.felix.scr.annotations.Service;
 import org.apache.felix.scr.annotations.Service;
+import org.onlab.onos.cluster.ClusterService;
 import org.onlab.onos.cluster.ControllerNode;
 import org.onlab.onos.cluster.ControllerNode;
 import org.onlab.onos.cluster.NodeId;
 import org.onlab.onos.cluster.NodeId;
 import org.onlab.onos.store.cluster.impl.ClusterMembershipEvent;
 import org.onlab.onos.store.cluster.impl.ClusterMembershipEvent;
@@ -42,6 +45,10 @@ public class ClusterCommunicationManager
     private final Logger log = LoggerFactory.getLogger(getClass());
     private final Logger log = LoggerFactory.getLogger(getClass());
 
 
     private ControllerNode localNode;
     private ControllerNode localNode;
+
+    @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
+    private ClusterService clusterService;
+
     private ClusterNodesDelegate nodesDelegate;
     private ClusterNodesDelegate nodesDelegate;
     // FIXME: `members` should go away and should be using ClusterService
     // FIXME: `members` should go away and should be using ClusterService
     private Map<NodeId, ControllerNode> members = new HashMap<>();
     private Map<NodeId, ControllerNode> members = new HashMap<>();
@@ -65,6 +72,7 @@ public class ClusterCommunicationManager
 
 
     @Activate
     @Activate
     public void activate() {
     public void activate() {
+        localNode = clusterService.getLocalNode();
         messagingService = new NettyMessagingService(localNode.tcpPort());
         messagingService = new NettyMessagingService(localNode.tcpPort());
         log.info("Started");
         log.info("Started");
     }
     }