You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2013/08/31 13:15:20 UTC
[4/4] git commit: CAMEL-6693: Fixed regression introduced by
Camel-5676. Thanks to Scott Cranton for finding and providing the solution.
CAMEL-6693: Fixed regression introduced by Camel-5676. Thanks to Scott Cranton for finding and providing the solution.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/1b911be5
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/1b911be5
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/1b911be5
Branch: refs/heads/camel-2.12.x
Commit: 1b911be5c53726e4e8daf3909e628ae6d0f7b64a
Parents: 1ab6105
Author: Claus Ibsen <da...@apache.org>
Authored: Sat Aug 31 13:13:29 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Aug 31 13:14:59 2013 +0200
----------------------------------------------------------------------
.../apache/camel/core/xml/AbstractCamelContextFactoryBean.java | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/1b911be5/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
----------------------------------------------------------------------
diff --git a/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java b/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
index 8b4ffb1..8e0b498 100644
--- a/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
+++ b/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
@@ -40,6 +40,7 @@ import org.apache.camel.component.properties.PropertiesComponent;
import org.apache.camel.component.properties.PropertiesParser;
import org.apache.camel.component.properties.PropertiesResolver;
import org.apache.camel.management.DefaultManagementAgent;
+import org.apache.camel.management.DefaultManagementLifecycleStrategy;
import org.apache.camel.management.DefaultManagementStrategy;
import org.apache.camel.management.ManagedManagementStrategy;
import org.apache.camel.model.ContextScanDefinition;
@@ -370,6 +371,10 @@ public abstract class AbstractCamelContextFactoryBean<T extends ModelCamelContex
ManagementStrategy managementStrategy = new ManagedManagementStrategy(getContext(), agent);
getContext().setManagementStrategy(managementStrategy);
+ // clear the existing lifecycle strategies define by the DefaultCamelContext constructor
+ getContext().getLifecycleStrategies().clear();
+ getContext().addLifecycleStrategy(new DefaultManagementLifecycleStrategy(getContext()));
+
// set additional configuration from camelJMXAgent
boolean onlyId = agent.getOnlyRegisterProcessorWithCustomId() != null && agent.getOnlyRegisterProcessorWithCustomId();
getContext().getManagementStrategy().onlyManageProcessorWithCustomId(onlyId);