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 2013/07/09 07:53:30 UTC
svn commit: r1501098 - in
/sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs:
JobManagerConfiguration.java JobManagerImpl.java TopologyCapabilities.java
Author: cziegeler
Date: Tue Jul 9 05:53:29 2013
New Revision: 1501098
URL: http://svn.apache.org/r1501098
Log:
SLING-2950 : Disabling the distribution flag takes only effect after bundle restart
Modified:
sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/JobManagerConfiguration.java
sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/JobManagerImpl.java
sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/TopologyCapabilities.java
Modified: sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/JobManagerConfiguration.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/JobManagerConfiguration.java?rev=1501098&r1=1501097&r2=1501098&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/JobManagerConfiguration.java (original)
+++ sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/JobManagerConfiguration.java Tue Jul 9 05:53:29 2013
@@ -79,7 +79,7 @@ public class JobManagerConfiguration {
private boolean disabledDistribution;
public JobManagerConfiguration(final Map<String, Object> props) {
- this.disabledDistribution = PropertiesUtil.toBoolean(props.get(PROPERTY_DISABLE_DISTRIBUTION), DEFAULT_DISABLE_DISTRIBUTION);
+ this.update(props);
this.jobsBasePathWithSlash = PropertiesUtil.toString(props.get(CONFIG_PROPERTY_REPOSITORY_PATH),
DEFAULT_REPOSITORY_PATH) + '/';
@@ -95,6 +95,13 @@ public class JobManagerConfiguration {
this.previousVersionAnonPath = this.jobsBasePathWithSlash + "anon";
this.previousVersionIdentifiedPath = this.jobsBasePathWithSlash + "identified";
+ }
+
+ /**
+ * Update with a new configuration
+ */
+ public void update(final Map<String, Object> props) {
+ this.disabledDistribution = PropertiesUtil.toBoolean(props.get(PROPERTY_DISABLE_DISTRIBUTION), DEFAULT_DISABLE_DISTRIBUTION);
this.backgroundLoadDelay = PropertiesUtil.toLong(props.get(CONFIG_PROPERTY_BACKGROUND_LOAD_DELAY), DEFAULT_BACKGROUND_LOAD_DELAY);
}
Modified: sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/JobManagerImpl.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/JobManagerImpl.java?rev=1501098&r1=1501097&r2=1501098&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/JobManagerImpl.java (original)
+++ sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/JobManagerImpl.java Tue Jul 9 05:53:29 2013
@@ -188,7 +188,11 @@ public class JobManagerImpl
*/
@Modified
protected void update(final Map<String, Object> props) {
- // nothing to do
+ this.configuration.update(props);
+ final TopologyCapabilities caps = this.topologyCapabilities;
+ if ( caps != null ) {
+ caps.update(this.configuration.disableDistribution());
+ }
}
/**
Modified: sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/TopologyCapabilities.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/TopologyCapabilities.java?rev=1501098&r1=1501097&r2=1501098&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/TopologyCapabilities.java (original)
+++ sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/TopologyCapabilities.java Tue Jul 9 05:53:29 2013
@@ -69,7 +69,7 @@ public class TopologyCapabilities {
private final InstanceDescriptionComparator instanceComparator;
/** Disable distribution flag. */
- private final boolean disableDistribution;
+ private boolean disableDistribution;
public static final class InstanceDescriptionComparator implements Comparator<InstanceDescription> {
@@ -143,6 +143,13 @@ public class TopologyCapabilities {
this.instanceCapabilities = newCaps;
}
+ /**
+ * Update the configuration
+ */
+ public void update(final boolean disableDistribution2) {
+ this.disableDistribution = disableDistribution2;
+ }
+
public boolean isSame(final Map<String, String> newAllInstancesMap) {
return this.allInstances.equals(newAllInstancesMap);
}
@@ -262,4 +269,5 @@ public class TopologyCapabilities {
public Map<String, List<InstanceDescription>> getInstanceCapabilities() {
return this.instanceCapabilities;
}
+
}