Fixes a NPE that occurs when device mastership is not immediately decided

Change-Id: I170974bf9e70cef5d7e73ecf31901879d858ddf7

Fixes a NPE that occurs when device mastership is not immediately decided
Change-Id: I170974bf9e70cef5d7e73ecf31901879d858ddf7
Madan Jampani · Gerrit Code Review
Commit 2096b93208fea34d87431cfb0bc15dc57cd90f7a 2096b932 1 parent 3d4d01cb
Showing 1 changed file with 1 additions and 1 deletions
core/net/src/main/java/org/onosproject/net/device/impl/DeviceManager.java
--- a/core/net/src/main/java/org/onosproject/net/device/impl/DeviceManager.java
View file @2096b93
+++ b/core/net/src/main/java/org/onosproject/net/device/impl/DeviceManager.java
View file @2096b93
@@ -307,7 +307,7 @@ public class DeviceManager
             // check my Role
             mastershipService.requestRoleFor(deviceId);
             final MastershipTerm term = termService.getMastershipTerm(deviceId);
-             if (!myNodeId.equals(term.master())) {
+             if (term == null || !myNodeId.equals(term.master())) {
                 log.info("Role of this node is STANDBY for {}", deviceId);
                 // TODO: Do we need to explicitly tell the Provider that
                 // this instance is not the MASTER