This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.discovery.oak-1.0.0 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-discovery-oak.git
commit f845fb81572e9f43955feb39f5e0d31187829a86 Author: Stefan Egli <[email protected]> AuthorDate: Mon Oct 26 10:47:52 2015 +0000 SLING-4603 : method renamed : handlePotentialTopologyChange, which is slightly confusing anyway, renamed to checkForTopologyChange git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/discovery/oak@1710561 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/sling/discovery/oak/OakDiscoveryService.java | 12 ++++++------ .../apache/sling/discovery/oak/pinger/OakViewChecker.java | 4 ++-- .../apache/sling/discovery/oak/OakDiscoveryServiceTest.java | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/java/org/apache/sling/discovery/oak/OakDiscoveryService.java b/src/main/java/org/apache/sling/discovery/oak/OakDiscoveryService.java index a75a2ef..49c307b 100644 --- a/src/main/java/org/apache/sling/discovery/oak/OakDiscoveryService.java +++ b/src/main/java/org/apache/sling/discovery/oak/OakDiscoveryService.java @@ -384,7 +384,7 @@ public class OakDiscoveryService extends BaseDiscoveryService { this.providerInfos.add(info); Collections.sort(this.providerInfos); this.doUpdateProperties(); - handlePotentialTopologyChange(); + checkForTopologyChange(); } /** @@ -423,7 +423,7 @@ public class OakDiscoveryService extends BaseDiscoveryService { final ProviderInfo info = new ProviderInfo(propertyProvider, props); if ( this.providerInfos.remove(info) && update ) { this.doUpdateProperties(); - this.handlePotentialTopologyChange(); + this.checkForTopologyChange(); } } @@ -527,7 +527,7 @@ public class OakDiscoveryService extends BaseDiscoveryService { logger.debug("updateProperties: calling doUpdateProperties."); doUpdateProperties(); logger.debug("updateProperties: calling handlePotentialTopologyChange."); - handlePotentialTopologyChange(); + checkForTopologyChange(); logger.debug("updateProperties: done."); } } @@ -610,13 +610,13 @@ public class OakDiscoveryService extends BaseDiscoveryService { } /** - * 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(); diff --git a/src/main/java/org/apache/sling/discovery/oak/pinger/OakViewChecker.java b/src/main/java/org/apache/sling/discovery/oak/pinger/OakViewChecker.java index cf50d26..1cd73c3 100644 --- a/src/main/java/org/apache/sling/discovery/oak/pinger/OakViewChecker.java +++ b/src/main/java/org/apache/sling/discovery/oak/pinger/OakViewChecker.java @@ -219,7 +219,7 @@ public class OakViewChecker extends BaseViewChecker { // all that we can therefore do here is assume something // might have changed and let discoveryService/viewStateManager // filter out the 99.99% of unchanged cases. - discoveryService.handlePotentialTopologyChange(); + discoveryService.checkForTopologyChange(); } logger.debug("discoveryLiteCheck: end. [for slingId="+slingId+"]"); } @@ -310,7 +310,7 @@ public class OakViewChecker extends BaseViewChecker { // all that we can therefore do here is assume something // might have changed and let discoveryService/viewStateManager // filter out the 99.99% of unchanged cases. - discoveryService.handlePotentialTopologyChange(); + discoveryService.checkForTopologyChange(); } protected void updateProperties() { diff --git a/src/test/java/org/apache/sling/discovery/oak/OakDiscoveryServiceTest.java b/src/test/java/org/apache/sling/discovery/oak/OakDiscoveryServiceTest.java index 5ca93bd..f1b965a 100644 --- a/src/test/java/org/apache/sling/discovery/oak/OakDiscoveryServiceTest.java +++ b/src/test/java/org/apache/sling/discovery/oak/OakDiscoveryServiceTest.java @@ -103,7 +103,7 @@ public class OakDiscoveryServiceTest { discoBuilder.setFinal(true); DescriptorHelper.setDiscoveryLiteDescriptor(builder.getResourceResolverFactory(), discoBuilder); - discoveryService.handlePotentialTopologyChange(); + discoveryService.checkForTopologyChange(); assertEquals(0, discoveryService.getViewStateManager().waitForAsyncEvents(2000)); assertEquals(1, listener.countEvents()); discoveryService.unbindTopologyEventListener(listener); -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
