commit | 2096b93208fea34d87431cfb0bc15dc57cd90f7a | [log] [tgz] |
---|---|---|
author | Madan Jampani <madan@onlab.us> | Thu Apr 30 12:55:25 2015 -0700 |
committer | Gerrit Code Review <gerrit@onlab.us> | Thu Apr 30 21:38:15 2015 +0000 |
tree | b7ce316cafa8557d69fed2ef188096ea4112932b | |
parent | 3d4d01cb74cbbb92dd1007a9ef6ada30d0322e9f [diff] |
Fixes a NPE that occurs when device mastership is not immediately decided Change-Id: I170974bf9e70cef5d7e73ecf31901879d858ddf7
diff --git a/core/net/src/main/java/org/onosproject/net/device/impl/DeviceManager.java b/core/net/src/main/java/org/onosproject/net/device/impl/DeviceManager.java index 756f272..58d0512 100644 --- a/core/net/src/main/java/org/onosproject/net/device/impl/DeviceManager.java +++ b/core/net/src/main/java/org/onosproject/net/device/impl/DeviceManager.java
@@ -307,7 +307,7 @@ // 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