sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From romb...@apache.org
Subject [sling-org-apache-sling-discovery-commons] 19/24: 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
Date Tue, 07 Nov 2017 09:27:01 GMT
This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to annotated tag org.apache.sling.discovery.commons-1.0.10
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-commons.git

commit c664312942ae065afb965edb2e0a570ff2b038fb
Author: Stefan Egli <stefanegli@apache.org>
AuthorDate: Wed Jan 27 15:17:48 2016 +0000

    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
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/commons@1727085
13f79535-47bb-0310-9956-ffa450edef68
---
 .../sling/discovery/commons/providers/base/ViewStateManagerImpl.java   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/main/java/org/apache/sling/discovery/commons/providers/base/ViewStateManagerImpl.java
b/src/main/java/org/apache/sling/discovery/commons/providers/base/ViewStateManagerImpl.java
index b6bff61..6757912 100644
--- a/src/main/java/org/apache/sling/discovery/commons/providers/base/ViewStateManagerImpl.java
+++ b/src/main/java/org/apache/sling/discovery/commons/providers/base/ViewStateManagerImpl.java
@@ -633,6 +633,9 @@ public class ViewStateManagerImpl implements ViewStateManager {
             if (oldInstance.isLeader() != newInstance.isLeader()) {
                 return false;
             }
+            if (oldInstance.getClusterView().getId() != newInstance.getClusterView().getId())
{
+                return false;
+            }
         }
         return true;
     }

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <commits@sling.apache.org>.

Mime
View raw message