commit 52abe3a170c6c09f84e41850a8e3065fd5b123ed
author sangho <sangho@onlab.us> Tue May 05 14:13:34 2015 -0700
committer Gerrit Code Review <gerrit@onlab.us> Tue May 05 21:46:38 2015 +0000
tree 5b3a38add4ee2f97567b5ba9b73fb20236d5b07c
parent 6f1b09e4d0c5f93e868058c063b9d19c365675f6

ONOS-1791 : Populates MPLS rules also at edge routers
 - Adds check for mastership when updating group description.

Change-Id: I536bcec595b8727689de11eb41e4b2f86cabb936

core/store/dist/src/main/java/org/onosproject/store/group/impl/DistributedGroupStore.java

diff --git a/core/store/dist/src/main/java/org/onosproject/store/group/impl/DistributedGroupStore.java b/core/store/dist/src/main/java/org/onosproject/store/group/impl/DistributedGroupStore.java
index 068582c..5c92ef6 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/group/impl/DistributedGroupStore.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/group/impl/DistributedGroupStore.java
@@ -463,8 +463,8 @@
                                        GroupBuckets newBuckets,
                                        GroupKey newAppCookie) {
         // Check if group update to be done by a remote instance
-        if (mastershipService.
-                getLocalRole(deviceId) != MastershipRole.MASTER) {
+        if (mastershipService.getMasterFor(deviceId) != null &&
+                mastershipService.getLocalRole(deviceId) != MastershipRole.MASTER) {
             GroupStoreMessage groupOp = GroupStoreMessage.
                     createGroupUpdateRequestMsg(deviceId,
                                                 oldAppCookie,