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

Change-Id: Iacdd8d8f6ef15560bc81162dfefde431271b1204

ONOS-1802: Added a null check for the returned term
Change-Id: Iacdd8d8f6ef15560bc81162dfefde431271b1204
Madan Jampani · Gerrit Code Review
Commit 7cdf3f1ba9bbc7268caebd09ab96cbc960d175c6 7cdf3f1b 1 parent e397ffe6
Showing 2 changed files with 3 additions and 3 deletions
core/net/src/main/java/org/onosproject/net/device/impl/DeviceManager.java
core/store/dist/src/main/java/org/onosproject/store/device/impl/GossipDeviceStore.java
--- a/core/net/src/main/java/org/onosproject/net/device/impl/DeviceManager.java
View file @7cdf3f1
+++ b/core/net/src/main/java/org/onosproject/net/device/impl/DeviceManager.java
View file @7cdf3f1
@@ -365,7 +365,7 @@ public class DeviceManager
                 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 @@ public class DeviceManager
             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;
--- a/core/store/dist/src/main/java/org/onosproject/store/device/impl/GossipDeviceStore.java
View file @7cdf3f1
+++ b/core/store/dist/src/main/java/org/onosproject/store/device/impl/GossipDeviceStore.java
View file @7cdf3f1
@@ -859,7 +859,7 @@ public class GossipDeviceStore
             log.debug("Temporarily requesting role for {} to remove", deviceId);
             mastershipService.requestRoleFor(deviceId);
             MastershipTerm term = termService.getMastershipTerm(deviceId);
-            if (myId.equals(term.master())) {
+            if (term != null && myId.equals(term.master())) {
                 master = myId;
             }
         }