[camel] branch master updated: CAMEL-12588 Fix Improvement

[acosentino]

This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/master by this push:
     new d3466f5  CAMEL-12588 Fix Improvement
d3466f5 is described below

commit d3466f5cbc5c432e6dc0e443a1615fa927b66d10
Author: Sudharsan Govindarajan <sudharsan.govindara...@pearlchain.net>
AuthorDate: Tue Jun 26 17:36:51 2018 +0200

    CAMEL-12588 Fix Improvement
---
 .../org/apache/camel/processor/aggregate/AggregateProcessor.java   | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git 
a/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java
 
b/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java
index 18fc42c..849687f 100644
--- 
a/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java
+++ 
b/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java
@@ -1448,6 +1448,13 @@ public class AggregateProcessor extends ServiceSupport 
implements AsyncProcessor
         if (recoverService != null) {
             camelContext.getExecutorServiceManager().shutdown(recoverService);
         }
+
+        if (shutdownTimeoutCheckerExecutorService && 
timeoutCheckerExecutorService != null) {
+            
camelContext.getExecutorServiceManager().shutdown(timeoutCheckerExecutorService);
+            timeoutCheckerExecutorService = null;
+            shutdownTimeoutCheckerExecutorService = false;
+        }
+
         ServiceHelper.stopServices(timeoutMap, processor, 
deadLetterProducerTemplate);
 
         if (closedCorrelationKeys != null) {