commit 7cdf3f1ba9bbc7268caebd09ab96cbc960d175c6
author Madan Jampani <madan@onlab.us> Tue May 12 23:18:05 2015 -0700
committer Gerrit Code Review <gerrit@onlab.us> Wed May 13 17:18:08 2015 +0000
tree 667517b5942c0ba9eb201fd81cf641cd2f05ff5f
parent e397ffe6a87583aef3a7a3299fddcc3afd1d7440

ONOS-1802: Added a null check for the returned term

Change-Id: Iacdd8d8f6ef15560bc81162dfefde431271b1204

core/net/src/main/java/org/onosproject/net/device/impl/DeviceManager.java

diff --git a/core/net/src/main/java/org/onosproject/net/device/impl/DeviceManager.java b/core/net/src/main/java/org/onosproject/net/device/impl/DeviceManager.java
index d975d8a..66bfab9 100644
--- a/core/net/src/main/java/org/onosproject/net/device/impl/DeviceManager.java
+++ b/core/net/src/main/java/org/onosproject/net/device/impl/DeviceManager.java
@@ -365,7 +365,7 @@
                 MastershipTerm term = termService.getMastershipTerm(deviceId);
                 final NodeId myNodeId = clusterService.getLocalNode().id();
                 // TODO: Move this type of check inside device clock manager, etc.
-                if (myNodeId.equals(term.master())) {
+                if (term != null && myNodeId.equals(term.master())) {
                     log.info("Retry marking {} offline", deviceId);
                     deviceClockProviderService.setMastershipTerm(deviceId, term);
                     event = store.markOffline(deviceId);
@@ -604,7 +604,7 @@
             if (myNodeId.equals(event.roleInfo().master())) {
                 // confirm latest info
                 MastershipTerm term = termService.getMastershipTerm(did);
-                final boolean iHaveControl = myNodeId.equals(term.master());
+                final boolean iHaveControl = term != null && myNodeId.equals(term.master());
                 if (iHaveControl) {
                     deviceClockProviderService.setMastershipTerm(did, term);
                     myNextRole = MASTER;