Author: davsclaus
Date: Thu Sep 27 15:02:11 2012
New Revision: 1391049
URL: http://svn.apache.org/viewvc?rev=1391049&view=rev
Log:
CAMEL-5657: Ensure eip shutdown thread pool when itself shutdown.
Modified:
camel/branches/camel-2.9.x/ (props changed)
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Merged /camel/trunk:r1391044
Merged /camel/branches/camel-2.10.x:r1391045
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/MulticastProcessor.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java?rev=1391049&r1=1391048&r2=1391049&view=diff
==============================================================================
---
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java
(original)
+++
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/processor/MulticastProcessor.java
Thu Sep 27 15:02:11 2012
@@ -955,6 +955,9 @@ public class MulticastProcessor extends
ServiceHelper.stopAndShutdownServices(processors, errorHandlers);
// only clear error handlers when shutting down
errorHandlers.clear();
+ if (aggregateExecutorService != null) {
+
getCamelContext().getExecutorServiceManager().shutdownNow(aggregateExecutorService);
+ }
}
protected static void setToEndpoint(Exchange exchange, Processor
processor) {
