commit f11412694c697eda18efc04d3aff2afb9b01dc01
author Jonathan Hart <jono@onlab.us> Thu Apr 23 11:27:07 2015 -0700
committer Jonathan Hart <jono@onlab.us> Thu Apr 23 11:27:07 2015 -0700
tree a10c2c48d05a5a374950565002f8f1aabb9471c1
parent a6c0d044ed86d5895e54f4e85b6e2c86458229b7

DistibutedClusterStore: use notifyDelegate to prevent NPE

Change-Id: I56b981355b02face3a5bb09d2ca2e2bd29f7c715

core/store/dist/src/main/java/org/onosproject/store/cluster/impl/DistributedClusterStore.java

diff --git a/core/store/dist/src/main/java/org/onosproject/store/cluster/impl/DistributedClusterStore.java b/core/store/dist/src/main/java/org/onosproject/store/cluster/impl/DistributedClusterStore.java
index 5d36bda..149a858 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/cluster/impl/DistributedClusterStore.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/cluster/impl/DistributedClusterStore.java
@@ -264,7 +264,7 @@
         ControllerNode node = new DefaultControllerNode(nodeId, ip, tcpPort);
         allNodes.put(node.id(), node);
         updateState(nodeId, State.INACTIVE);
-        delegate.notify(new ClusterEvent(ClusterEvent.Type.INSTANCE_ADDED, node));
+        notifyDelegate(new ClusterEvent(ClusterEvent.Type.INSTANCE_ADDED, node));
         return node;
     }
 
@@ -274,7 +274,7 @@
         ControllerNode node = allNodes.remove(nodeId);
         if (node != null) {
             nodeStates.remove(nodeId);
-            delegate.notify(new ClusterEvent(ClusterEvent.Type.INSTANCE_REMOVED, node));
+            notifyDelegate(new ClusterEvent(ClusterEvent.Type.INSTANCE_REMOVED, node));
         }
     }
 
@@ -344,9 +344,9 @@
     private void notifyStateChange(NodeId nodeId, State oldState, State newState) {
         ControllerNode node = allNodes.get(nodeId);
         if (newState == State.ACTIVE) {
-            delegate.notify(new ClusterEvent(ClusterEvent.Type.INSTANCE_ACTIVATED, node));
+            notifyDelegate(new ClusterEvent(ClusterEvent.Type.INSTANCE_ACTIVATED, node));
         } else {
-            delegate.notify(new ClusterEvent(ClusterEvent.Type.INSTANCE_DEACTIVATED, node));
+            notifyDelegate(new ClusterEvent(ClusterEvent.Type.INSTANCE_DEACTIVATED, node));
         }
     }