commit 3650fc4a5b51393cef5cdb3e475f929c0728a315
author Madan Jampani <madan@onlab.us> Wed May 27 17:01:50 2015 -0700
committer Gerrit Code Review <gerrit@onlab.us> Thu May 28 00:29:16 2015 +0000
tree bdcde7b4f674e60c9c92c3a2d838065ebad02eb9
parent 90dc8c51ac0d40e6df47e521af7860640d2abb42

Eliminate possible redundant update when rearranging candidate order in leadership manager

Change-Id: Id76345ab827c4b6f55114f3afacdbc334092818a

core/store/dist/src/main/java/org/onosproject/store/consistent/impl/DistributedLeadershipManager.java

diff --git a/core/store/dist/src/main/java/org/onosproject/store/consistent/impl/DistributedLeadershipManager.java b/core/store/dist/src/main/java/org/onosproject/store/consistent/impl/DistributedLeadershipManager.java
index df8dd2e..fa9d7cb 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/consistent/impl/DistributedLeadershipManager.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/consistent/impl/DistributedLeadershipManager.java
@@ -2,6 +2,7 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
@@ -350,8 +351,9 @@
     @Override
     public boolean makeTopCandidate(String path, NodeId nodeId) {
         Versioned<List<NodeId>> newCandidates = candidateMap.computeIf(path,
-                candidates -> (candidates != null && candidates.contains(nodeId)) ||
-                              (candidates != null && Objects.equals(nodeId, candidates.get(LEADER_CANDIDATE_POS))),
+                candidates -> candidates != null &&
+                              candidates.contains(nodeId) &&
+                              !nodeId.equals(Iterables.getFirst(candidates, null)),
                 (topic, candidates) -> {
                     List<NodeId> updatedCandidates = new ArrayList<>(candidates.size());
                     updatedCandidates.add(nodeId);