홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Madan Jampani
dbe8a813 1 parent 4124bc36

Fixes NPE in ConsistentDeviceMastershipStore 

Change-Id: Id07c8d41338a48e58d7e3ea98312691a2011eeef
Inline Side-by-side
Showing 1 changed file with 3 additions and 2 deletions
...@@ -236,7 +236,8 @@ public class ConsistentDeviceMastershipStore ...@@ -236,7 +236,8 @@ public class ConsistentDeviceMastershipStore
236 236
237 String leadershipTopic = createDeviceMastershipTopic(deviceId); 237 String leadershipTopic = createDeviceMastershipTopic(deviceId);
238 Leadership leadership = leadershipService.getLeadership(leadershipTopic); 238 Leadership leadership = leadershipService.getLeadership(leadershipTopic);
239 - return leadership != null ? MastershipTerm.of(leadership.leaderNodeId(), leadership.leader().term()) : null; 239 + return leadership != null && leadership.leaderNodeId() != null ?
240 + MastershipTerm.of(leadership.leaderNodeId(), leadership.leader().term()) : null;
240 } 241 }
241 242
242 @Override 243 @Override
...@@ -349,4 +350,4 @@ public class ConsistentDeviceMastershipStore ...@@ -349,4 +350,4 @@ public class ConsistentDeviceMastershipStore
349 Matcher m = DEVICE_MASTERSHIP_TOPIC_PATTERN.matcher(topic); 350 Matcher m = DEVICE_MASTERSHIP_TOPIC_PATTERN.matcher(topic);
350 return m.matches(); 351 return m.matches();
351 } 352 }
352 -}
...\ No newline at end of file ...\ No newline at end of file
353 +}
......