Fixes NPE in ConsistentDeviceMastershipStore

Change-Id: Id07c8d41338a48e58d7e3ea98312691a2011eeef

Fixes NPE in ConsistentDeviceMastershipStore
Change-Id: Id07c8d41338a48e58d7e3ea98312691a2011eeef
Madan Jampani
Commit dbe8a813b844dc1b84b9a889504fcb36aebc4688 dbe8a813 1 parent 4124bc36
Showing 1 changed file with 2 additions and 1 deletions
core/store/dist/src/main/java/org/onosproject/store/mastership/impl/ConsistentDeviceMastershipStore.java
--- a/core/store/dist/src/main/java/org/onosproject/store/mastership/impl/ConsistentDeviceMastershipStore.java
View file @dbe8a81
+++ b/core/store/dist/src/main/java/org/onosproject/store/mastership/impl/ConsistentDeviceMastershipStore.java
View file @dbe8a81
@@ -236,7 +236,8 @@ public class ConsistentDeviceMastershipStore
         String leadershipTopic = createDeviceMastershipTopic(deviceId);
         Leadership leadership = leadershipService.getLeadership(leadershipTopic);
-        return leadership != null ? MastershipTerm.of(leadership.leaderNodeId(), leadership.leader().term()) : null;
+        return leadership != null && leadership.leaderNodeId() != null ?
+            MastershipTerm.of(leadership.leaderNodeId(), leadership.leader().term()) : null;
     }
     @Override