Author: davsclaus
Date: Thu Sep 27 14:20:08 2012
New Revision: 1391026

URL: http://svn.apache.org/viewvc?rev=1391026&view=rev
Log:
CAMEL-5657: Ensure recipient list eip shutdown thread pool on shutdown if 
instructed to do so.

Modified:
    camel/branches/camel-2.9.x/   (props changed)
    
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/processor/RecipientList.java

Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
  Merged /camel/trunk:r1391021
  Merged /camel/branches/camel-2.10.x:r1391024

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

Modified: 
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/processor/RecipientList.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/processor/RecipientList.java?rev=1391026&r1=1391025&r2=1391026&view=diff
==============================================================================
--- 
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/processor/RecipientList.java
 (original)
+++ 
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/processor/RecipientList.java
 Thu Sep 27 14:20:08 2012
@@ -175,6 +175,10 @@ public class RecipientList extends Servi
         // remove producer cache from service
         camelContext.removeService(producerCache);
         ServiceHelper.stopAndShutdownService(producerCache);
+
+        if (shutdownExecutorService && executorService != null) {
+            
camelContext.getExecutorServiceManager().shutdownNow(executorService);
+        }
     }
 
     public boolean isStreaming() {


Reply via email to