Author: davsclaus
Date: Thu Sep 27 14:18:51 2012
New Revision: 1391024
URL: http://svn.apache.org/viewvc?rev=1391024&view=rev
Log:
CAMEL-5657: Ensure recipient list eip shutdown thread pool on shutdown if
instructed to do so.
Modified:
camel/branches/camel-2.10.x/ (props changed)
camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/processor/RecipientList.java
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Merged /camel/trunk:r1391021
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/processor/RecipientList.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/processor/RecipientList.java?rev=1391024&r1=1391023&r2=1391024&view=diff
==============================================================================
---
camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/processor/RecipientList.java
(original)
+++
camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/processor/RecipientList.java
Thu Sep 27 14:18:51 2012
@@ -172,6 +172,10 @@ public class RecipientList extends Servi
protected void doShutdown() throws Exception {
ServiceHelper.stopAndShutdownService(producerCache);
+
+ if (shutdownExecutorService && executorService != null) {
+
camelContext.getExecutorServiceManager().shutdownNow(executorService);
+ }
}
public boolean isStreaming() {
