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/store/dist/src/main/java/org/onosproject/store/device/impl/GossipDeviceStore.java

diff --git a/core/store/dist/src/main/java/org/onosproject/store/device/impl/GossipDeviceStore.java b/core/store/dist/src/main/java/org/onosproject/store/device/impl/GossipDeviceStore.java
index 25f3347..8852c49 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/device/impl/GossipDeviceStore.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/device/impl/GossipDeviceStore.java
@@ -859,7 +859,7 @@
             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;
             }
         }