[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 dc936e0  CAMEL-12588 Fix Improvement
dc936e0 is described below

commit dc936e03bc02c2ac536b2929b676594bebb7124f
Author: Sudharsan Govindarajan <sudharsan.govindara...@pearlchain.net>
AuthorDate: Tue Jun 19 16:06:27 2018 +0200

    CAMEL-12588 Fix Improvement
    
    AggregateProcessor doStop() method changed to call shutdown() instead of
    shutdownNow()
---
 .../java/org/apache/camel/processor/aggregate/AggregateProcessor.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 81417cd..c9b53c2 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
@@ -1450,7 +1450,7 @@ public class AggregateProcessor extends ServiceSupport 
implements AsyncProcessor
         }
         
         if (timeoutCheckerExecutorService != null) {
-            
camelContext.getExecutorServiceManager().shutdownNow(timeoutCheckerExecutorService);
+            
camelContext.getExecutorServiceManager().shutdown(timeoutCheckerExecutorService);
         }
         
         ServiceHelper.stopServices(timeoutMap, processor, 
deadLetterProducerTemplate);