commit 780b138a52d6bdc5b981cfa3b8cc8d24b9fcb419
author Yuta HIGUCHI <y-higuchi@onlab.us> Mon Nov 03 14:36:39 2014 -0800
committer Yuta HIGUCHI <y-higuchi@onlab.us> Mon Nov 03 14:49:27 2014 -0800
tree 7005d1ca853c14a5d26c45d31d164b934df8deea
parent 1bd9ccf510c557e91ecb9b7d46489a4a94ad2f03

minor bug fix

Change-Id: Icfe2f2b5cfefa6fc8a7e55ceb86a6785e57f04b3

core/store/dist/src/main/java/org/onlab/onos/store/mastership/impl/DistributedMastershipStore.java

diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/mastership/impl/DistributedMastershipStore.java b/core/store/dist/src/main/java/org/onlab/onos/store/mastership/impl/DistributedMastershipStore.java
index c9d4422..713be4e 100644
--- a/core/store/dist/src/main/java/org/onlab/onos/store/mastership/impl/DistributedMastershipStore.java
+++ b/core/store/dist/src/main/java/org/onlab/onos/store/mastership/impl/DistributedMastershipStore.java
@@ -447,7 +447,13 @@
             RoleValue oldValue = event.getOldValue();
             RoleValue newValue = event.getValue();
 
-            if (Objects.equal(oldValue.get(MASTER), newValue.get(MASTER))) {
+            NodeId oldMaster = null;
+            if (oldValue != null) {
+                oldMaster = oldValue.get(MASTER);
+            }
+            NodeId newMaster = newValue.get(MASTER);
+
+            if (Objects.equal(oldMaster, newMaster)) {
                 notifyDelegate(new MastershipEvent(
                         MASTER_CHANGED, event.getKey(), event.getValue().roleInfo()));
             } else {