svn commit: r1381140 - in /camel/branches/camel-2.10.x: ./ camel-core/src/test/java/org/apache/camel/impl/MultipleLifecycleStrategyTest.java

[davsclaus]

Author: davsclaus
Date: Wed Sep  5 11:02:31 2012
New Revision: 1381140

URL: http://svn.apache.org/viewvc?rev=1381140&view=rev
Log:
CAMEL-5563: Camel now shutdown thread pools graceful at first and then fallback 
to be aggresive as before. Added more logging details during shutdown, as well 
logging if the shutdown takes a while. As well if there was any thread pools 
when Camel shutdown that wasnt properly shutdown beforehand. The graceful 
shutdown uses a 30 sec timeout.

Modified:
    camel/branches/camel-2.10.x/   (props changed)
    
camel/branches/camel-2.10.x/camel-core/src/test/java/org/apache/camel/impl/MultipleLifecycleStrategyTest.java

Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
  Merged /camel/trunk:r1381137

Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
camel/branches/camel-2.10.x/camel-core/src/test/java/org/apache/camel/impl/MultipleLifecycleStrategyTest.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/camel-core/src/test/java/org/apache/camel/impl/MultipleLifecycleStrategyTest.java?rev=1381140&r1=1381139&r2=1381140&view=diff
==============================================================================
--- 
camel/branches/camel-2.10.x/camel-core/src/test/java/org/apache/camel/impl/MultipleLifecycleStrategyTest.java
 (original)
+++ 
camel/branches/camel-2.10.x/camel-core/src/test/java/org/apache/camel/impl/MultipleLifecycleStrategyTest.java
 Wed Sep  5 11:02:31 2012
@@ -51,8 +51,9 @@ public class MultipleLifecycleStrategyTe
         context.stop();
 
         List<String> expectedEvents = Arrays.asList("onContextStart", 
"onServiceAdd", "onServiceAdd", "onServiceAdd",
-                "onServiceAdd", "onServiceAdd", "onServiceAdd", 
"onServiceAdd", "onThreadPoolAdd", "onThreadPoolAdd",
-                "onComponentAdd", "onEndpointAdd", "onComponentRemove", 
"onContextStop"); 
+                "onServiceAdd", "onServiceAdd", "onServiceAdd", 
"onServiceAdd", "onThreadPoolAdd", "onServiceAdd",
+                "onThreadPoolAdd", "onComponentAdd", "onEndpointAdd", 
"onComponentRemove", "onContextStop");
+
         assertEquals(expectedEvents, dummy1.getEvents());
         assertEquals(expectedEvents, dummy2.getEvents());
     }