You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2015/04/20 16:58:45 UTC
svn commit: r1674907 -
/sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/config/TopologyCapabilities.java
Author: cziegeler
Date: Mon Apr 20 14:58:45 2015
New Revision: 1674907
URL: http://svn.apache.org/r1674907
Log:
SLING-4634 : Directly check if view is still current
Modified:
sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/config/TopologyCapabilities.java
Modified: sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/config/TopologyCapabilities.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/config/TopologyCapabilities.java?rev=1674907&r1=1674906&r2=1674907&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/config/TopologyCapabilities.java (original)
+++ sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/config/TopologyCapabilities.java Mon Apr 20 14:58:45 2015
@@ -69,6 +69,9 @@ public class TopologyCapabilities {
/** JobManagerConfiguration. */
private final JobManagerConfiguration jobManagerConfiguration;
+ /** Topology view. */
+ private final TopologyView view;
+
public static final class InstanceDescriptionComparator implements Comparator<InstanceDescription> {
private final String localClusterId;
@@ -145,6 +148,7 @@ public class TopologyCapabilities {
this.instanceMap.put(desc.getSlingId(), desc);
}
this.instanceCapabilities = newCaps;
+ this.view = view;
}
/**
@@ -169,7 +173,7 @@ public class TopologyCapabilities {
* @return {@code true} if still active.
*/
public boolean isActive() {
- return this.active;
+ return this.active && this.view.isCurrent();
}
/**