DistibutedClusterStore: use notifyDelegate to prevent NPE

Change-Id: I56b981355b02face3a5bb09d2ca2e2bd29f7c715

@@ -264,7 +264,7 @@ public class DistributedClusterStore
         ControllerNode node = new DefaultControllerNode(nodeId, ip, tcpPort);
         ControllerNode node = new DefaultControllerNode(nodeId, ip, tcpPort);
         allNodes.put(node.id(), node);
         allNodes.put(node.id(), node);
         updateState(nodeId, State.INACTIVE);
         updateState(nodeId, State.INACTIVE);
-        delegate.notify(new ClusterEvent(ClusterEvent.Type.INSTANCE_ADDED, node));
+        notifyDelegate(new ClusterEvent(ClusterEvent.Type.INSTANCE_ADDED, node));
         return node;
         return node;
     }
     }
 
 
@@ -274,7 +274,7 @@ public class DistributedClusterStore
         ControllerNode node = allNodes.remove(nodeId);
         ControllerNode node = allNodes.remove(nodeId);
         if (node != null) {
         if (node != null) {
             nodeStates.remove(nodeId);
             nodeStates.remove(nodeId);
-            delegate.notify(new ClusterEvent(ClusterEvent.Type.INSTANCE_REMOVED, node));
+            notifyDelegate(new ClusterEvent(ClusterEvent.Type.INSTANCE_REMOVED, node));
         }
         }
     }
     }
 
 
@@ -344,9 +344,9 @@ public class DistributedClusterStore
     private void notifyStateChange(NodeId nodeId, State oldState, State newState) {
     private void notifyStateChange(NodeId nodeId, State oldState, State newState) {
         ControllerNode node = allNodes.get(nodeId);
         ControllerNode node = allNodes.get(nodeId);
         if (newState == State.ACTIVE) {
         if (newState == State.ACTIVE) {
-            delegate.notify(new ClusterEvent(ClusterEvent.Type.INSTANCE_ACTIVATED, node));
+            notifyDelegate(new ClusterEvent(ClusterEvent.Type.INSTANCE_ACTIVATED, node));
         } else {
         } else {
-            delegate.notify(new ClusterEvent(ClusterEvent.Type.INSTANCE_DEACTIVATED, node));
+            notifyDelegate(new ClusterEvent(ClusterEvent.Type.INSTANCE_DEACTIVATED, node));
         }
         }
     }
     }