commit dfe6e3bd051ea911a2eceebd0904746967522b52
author Yuta HIGUCHI <y-higuchi@onlab.us> Thu Oct 30 11:31:51 2014 -0700
committer Yuta HIGUCHI <y-higuchi@onlab.us> Thu Oct 30 12:10:24 2014 -0700
tree 619e5e108172837323b583372174a087522e466f
parent 8cd66a53aaf56f9342331a5e3cd7caafcdcaab43

allow null Master in MastershipTerm

Change-Id: I840354eb6d0b5a1bac91887a41626c33c49d592c

core/net/src/main/java/org/onlab/onos/net/device/impl/DeviceManager.java

diff --git a/core/net/src/main/java/org/onlab/onos/net/device/impl/DeviceManager.java b/core/net/src/main/java/org/onlab/onos/net/device/impl/DeviceManager.java
index d1dab70..178a1a3 100644
--- a/core/net/src/main/java/org/onlab/onos/net/device/impl/DeviceManager.java
+++ b/core/net/src/main/java/org/onlab/onos/net/device/impl/DeviceManager.java
@@ -257,7 +257,8 @@
             MastershipTerm term = mastershipService.requestTermService()
                     .getMastershipTerm(deviceId);
 
-            if (!term.master().equals(clusterService.getLocalNode().id())) {
+            final NodeId myNodeId = clusterService.getLocalNode().id();
+            if (!myNodeId.equals(term.master())) {
                 // lost mastership after requestRole told this instance was MASTER.
                 log.info("lost mastership before getting term info.");
                 return;