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 2011/09/20 14:16:37 UTC
svn commit: r1173107 - in /camel/branches/camel-2.8.x: ./
camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
camel-core/src/test/java/org/apache/camel/impl/LifecycleStrategyServiceTest.java
Author: davsclaus
Date: Tue Sep 20 12:16:37 2011
New Revision: 1173107
URL: http://svn.apache.org/viewvc?rev=1173107&view=rev
Log:
Merged revisions 1173106 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
Added:
camel/branches/camel-2.8.x/camel-core/src/test/java/org/apache/camel/impl/LifecycleStrategyServiceTest.java
- copied unchanged from r1173106, camel/trunk/camel-core/src/test/java/org/apache/camel/impl/LifecycleStrategyServiceTest.java
Modified:
camel/branches/camel-2.8.x/ (props changed)
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
svn:mergeinfo = /camel/trunk:1173106
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java?rev=1173107&r1=1173106&r2=1173107&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java (original)
+++ camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java Tue Sep 20 12:16:37 2011
@@ -1393,6 +1393,7 @@ public class DefaultCamelContext extends
getManagementStrategy().start();
// start lifecycle strategies
+ ServiceHelper.startServices(lifecycleStrategies);
Iterator<LifecycleStrategy> it = lifecycleStrategies.iterator();
while (it.hasNext()) {
LifecycleStrategy strategy = it.next();
@@ -1502,6 +1503,8 @@ public class DefaultCamelContext extends
// shutdown management as the last one
shutdownServices(managementStrategy);
+ shutdownServices(lifecycleStrategies);
+ lifecycleStrategies.clear();
// stop the lazy created so they can be re-created on restart
forceStopLazyInitialization();