commit eabae96ca727e66a4b0cd56cb5c25c940806cbea
author Jordan Halterman <jordan@opennetworking.org> Tue Aug 01 17:29:36 2017 -0700
committer Ray Milkey <ray@opennetworking.org> Wed Aug 02 23:04:07 2017 +0000
tree 2c3ecd563949d649ba9fe1189b0352077ed0cbe6
parent 2eec2c88d50f71c73b71c9278f6d03450230d06d

Prevent duplicate events on null versions in DistributedClusterStore

Change-Id: I7204570955b9b04bab0c0904b95c58acf8c94797

core/store/dist/src/main/java/org/onosproject/store/cluster/impl/DistributedClusterStore.java

diff --git a/core/store/dist/src/main/java/org/onosproject/store/cluster/impl/DistributedClusterStore.java b/core/store/dist/src/main/java/org/onosproject/store/cluster/impl/DistributedClusterStore.java
index 4374a43..b539a64 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/cluster/impl/DistributedClusterStore.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/cluster/impl/DistributedClusterStore.java
@@ -267,7 +267,8 @@
     private void updateNode(NodeId nodeId, State newState, Version newVersion) {
         State currentState = nodeStates.get(nodeId);
         Version currentVersion = nodeVersions.get(nodeId);
-        if (!Objects.equals(currentState, newState) || !Objects.equals(currentVersion, newVersion)) {
+        if (!Objects.equals(currentState, newState)
+                || (newVersion != null && !Objects.equals(currentVersion, newVersion))) {
             nodeStates.put(nodeId, newState);
             if (newVersion != null) {
                 nodeVersions.put(nodeId, newVersion);