You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by st...@apache.org on 2016/01/27 16:17:49 UTC

svn commit: r1727085 - /sling/trunk/bundles/extensions/discovery/commons/src/main/java/org/apache/sling/discovery/commons/providers/base/ViewStateManagerImpl.java

Author: stefanegli
Date: Wed Jan 27 15:17:48 2016
New Revision: 1727085

URL: http://svn.apache.org/viewvc?rev=1727085&view=rev
Log:
SLING-5458 : when clusterView.getId differs, that must result in a TOPOLOGY_CHANGING/CHANGED sequence - unlike before this fix where it just resulted in a PROPERTIES_CHANGED - which is wrong

Modified:
    sling/trunk/bundles/extensions/discovery/commons/src/main/java/org/apache/sling/discovery/commons/providers/base/ViewStateManagerImpl.java

Modified: sling/trunk/bundles/extensions/discovery/commons/src/main/java/org/apache/sling/discovery/commons/providers/base/ViewStateManagerImpl.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/discovery/commons/src/main/java/org/apache/sling/discovery/commons/providers/base/ViewStateManagerImpl.java?rev=1727085&r1=1727084&r2=1727085&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/discovery/commons/src/main/java/org/apache/sling/discovery/commons/providers/base/ViewStateManagerImpl.java (original)
+++ sling/trunk/bundles/extensions/discovery/commons/src/main/java/org/apache/sling/discovery/commons/providers/base/ViewStateManagerImpl.java Wed Jan 27 15:17:48 2016
@@ -633,6 +633,9 @@ public class ViewStateManagerImpl implem
             if (oldInstance.isLeader() != newInstance.isLeader()) {
                 return false;
             }
+            if (oldInstance.getClusterView().getId() != newInstance.getClusterView().getId()) {
+                return false;
+            }
         }
         return true;
     }