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 2015/09/24 16:22:11 UTC
svn commit: r1705067 -
/sling/trunk/bundles/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/DiscoveryServiceImpl.java
Author: stefanegli
Date: Thu Sep 24 14:22:11 2015
New Revision: 1705067
URL: http://svn.apache.org/viewvc?rev=1705067&view=rev
Log:
SLING-5030 : ensure delayedEventPendingFailed is always correctly set to false
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=1705067&r1=1705066&r2=1705067&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 Thu Sep 24 14:22:11 2015
@@ -841,6 +841,7 @@ public class DiscoveryServiceImpl implem
logger.debug("handlePotentialTopologyChange: sending delayed event now");
if (!activated) {
delayedEventPending = false;
+ delayedEventPendingFailed = false;
logger.debug("handlePotentialTopologyChange: no longer activated. not sending delayed event");
return;
}
@@ -866,10 +867,12 @@ public class DiscoveryServiceImpl implem
enqueueForAll(Type.TOPOLOGY_CHANGED, DiscoveryServiceImpl.this.oldView, newView);
delayedEventPending = false;
+ delayedEventPendingFailed = false;
}
}
})) {
delayedEventPending = true;
+ delayedEventPendingFailed = false;
logger.debug("handlePotentialTopologyChange: delayed event triggering.");
return;
} else {