Author: davsclaus
Date: Thu Sep 27 15:00:32 2012
New Revision: 1391045
URL: http://svn.apache.org/viewvc?rev=1391045&view=rev
Log:
CAMEL-5657: Ensure eip shutdown thread pool when itself shutdown.
Modified:
camel/branches/camel-2.10.x/ (props changed)
camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Merged /camel/trunk:r1391044
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/MulticastProcessor.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java?rev=1391045&r1=1391044&r2=1391045&view=diff
==============================================================================
---
camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java
(original)
+++
camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java
Thu Sep 27 15:00:32 2012
@@ -967,6 +967,9 @@ public class MulticastProcessor extends
if (shutdownExecutorService && executorService != null) {
getCamelContext().getExecutorServiceManager().shutdownNow(executorService);
}
+ if (aggregateExecutorService != null) {
+
getCamelContext().getExecutorServiceManager().shutdownNow(aggregateExecutorService);
+ }
}
protected static void setToEndpoint(Exchange exchange, Processor
processor) {
