commit 1af8e137e378d2a87f908b9ce6af394703fe62c9
author Madan Jampani <madan@onlab.us> Thu Apr 30 16:41:18 2015 -0700
committer Gerrit Code Review <gerrit@onlab.us> Fri May 01 00:34:45 2015 +0000
tree dd5ccdcb94be8675c4c110c85051d5e0bca0adbc
parent 4b18a23ccf470b4e43721b0a49a0f2e1ade8c840

Fix balance-masters functionality in the new LeadershipService based device mastership store

Change-Id: I9f64d514cee7d5a5383fd4c2fa30a8616c97785c

core/net/src/main/java/org/onosproject/net/device/impl/DeviceManager.java

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 58d0512..d975d8a 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
@@ -536,7 +536,7 @@
         if (myNextRole == NONE) {
             mastershipService.requestRoleFor(did);
             MastershipTerm term = termService.getMastershipTerm(did);
-            if (myNodeId.equals(term.master())) {
+            if (term != null && myNodeId.equals(term.master())) {
                 myNextRole = MASTER;
             } else {
                 myNextRole = STANDBY;