svn commit: r1710589 - /sling/trunk/bundles/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/DiscoveryServiceImpl.java

[st...@apache.org]

Author: stefanegli
Date: Mon Oct 26 12:53:06 2015
New Revision: 1710589

URL: http://svn.apache.org/viewvc?rev=1710589&view=rev
Log:
SLING-5195 related : renamed confusingly named handlePotentialTopologyChange into checkForTopologyChange

Modified:
    sling/trunk/bundles/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/DiscoveryServiceImpl.java

Modified: sling/trunk/bundles/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/DiscoveryServiceImpl.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/DiscoveryServiceImpl.java?rev=1710589&r1=1710588&r2=1710589&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/DiscoveryServiceImpl.java (original)
+++ sling/trunk/bundles/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/DiscoveryServiceImpl.java Mon Oct 26 12:53:06 2015
@@ -368,7 +368,7 @@ public class DiscoveryServiceImpl extend
         this.providerInfos.add(info);
         Collections.sort(this.providerInfos);
         this.doUpdateProperties();
-        handlePotentialTopologyChange();
+        checkForTopologyChange();
     }
 
     /**
@@ -407,7 +407,7 @@ public class DiscoveryServiceImpl extend
         final ProviderInfo info = new ProviderInfo(propertyProvider, props);
         if ( this.providerInfos.remove(info) && update ) {
             this.doUpdateProperties();
-            this.handlePotentialTopologyChange();
+            this.checkForTopologyChange();
         }
     }
 
@@ -511,7 +511,7 @@ public class DiscoveryServiceImpl extend
             logger.debug("updateProperties: calling doUpdateProperties.");
             doUpdateProperties();
             logger.debug("updateProperties: calling handlePotentialTopologyChange.");
-            handlePotentialTopologyChange();
+            checkForTopologyChange();
             logger.debug("updateProperties: done.");
         }
     }
@@ -594,13 +594,13 @@ public class DiscoveryServiceImpl extend
     }
 
     /**
-     * Handle the fact that the topology has likely changed
+     * Check the current topology for any potential change
      */
-    public void handlePotentialTopologyChange() {
+    public void checkForTopologyChange() {
         viewStateManagerLock.lock();
         try{
             if (!activated) {
-                logger.debug("handlePotentialTopologyChange: not yet activated, ignoring");
+                logger.debug("checkForTopologyChange: not yet activated, ignoring");
                 return;
             }
             BaseTopologyView t = (BaseTopologyView) getTopology();