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/11/15 14:18:07 UTC
svn commit: r1202171 - in /camel/branches/camel-2.8.x: ./
camel-core/src/main/java/org/apache/camel/impl/
camel-core/src/test/java/org/apache/camel/impl/
Author: davsclaus
Date: Tue Nov 15 13:18:06 2011
New Revision: 1202171
URL: http://svn.apache.org/viewvc?rev=1202171&view=rev
Log:
CAMEL-4682: Improve restarting CamelContext to ensure lifecycle strategies is not lost.
Added:
camel/branches/camel-2.8.x/camel-core/src/test/java/org/apache/camel/impl/DefaultCamelContextRestartTest.java
- copied unchanged from r1202167, camel/trunk/camel-core/src/test/java/org/apache/camel/impl/DefaultCamelContextRestartTest.java
camel/branches/camel-2.8.x/camel-core/src/test/java/org/apache/camel/impl/DefaultCamelContextWithLifecycleStrategyRestartTest.java
- copied unchanged from r1202167, camel/trunk/camel-core/src/test/java/org/apache/camel/impl/DefaultCamelContextWithLifecycleStrategyRestartTest.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 (original)
+++ svn:mergeinfo Tue Nov 15 13:18:06 2011
@@ -1 +1 @@
-/camel/trunk:1202148
+/camel/trunk:1202148,1202167
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=1202171&r1=1202170&r2=1202171&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 Nov 15 13:18:06 2011
@@ -1515,7 +1515,7 @@ public class DefaultCamelContext extends
// shutdown management as the last one
shutdownServices(managementStrategy);
shutdownServices(lifecycleStrategies);
- lifecycleStrategies.clear();
+ // do not clear lifecycleStrategies as we can start Camel again and get the route back as before
// stop the lazy created so they can be re-created on restart
forceStopLazyInitialization();