You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2018/06/29 07:06:38 UTC
[camel] branch camel-2.20.x updated: CAMEL-12588 Fix Improvement
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch camel-2.20.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-2.20.x by this push:
new e91693d CAMEL-12588 Fix Improvement
e91693d is described below
commit e91693d69fb297ce01f0542756d2c9695f56e956
Author: Sudharsan Govindarajan <su...@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 4515fa3..246cdc0 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
@@ -1429,6 +1429,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) {