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/20 12:45:41 UTC
[camel] branch master updated (703cbe0 -> 2ad1533)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 703cbe0 Upgrade Spring Cloud to version 2.0.0.RELEASE
new b8900cd Revert "CAMEL-12588 Fix Improvement"
new 2ad1533 Revert "Cleanup TimeOutChecker threads"
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../org/apache/camel/processor/aggregate/AggregateProcessor.java | 5 -----
1 file changed, 5 deletions(-)
[camel] 01/02: Revert "CAMEL-12588 Fix Improvement"
Posted by ac...@apache.org.
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
commit b8900cd656476175770869d83f2ab99935650b0c
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Jun 20 14:44:42 2018 +0200
Revert "CAMEL-12588 Fix Improvement"
This reverts commit dc936e03bc02c2ac536b2929b676594bebb7124f.
---
.../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 c9b53c2..81417cd 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().shutdown(timeoutCheckerExecutorService);
+ camelContext.getExecutorServiceManager().shutdownNow(timeoutCheckerExecutorService);
}
ServiceHelper.stopServices(timeoutMap, processor, deadLetterProducerTemplate);
[camel] 02/02: Revert "Cleanup TimeOutChecker threads"
Posted by ac...@apache.org.
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
commit 2ad153385592980e4381c18534829d0fe7c2bc59
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Jun 20 14:44:57 2018 +0200
Revert "Cleanup TimeOutChecker threads"
This reverts commit 8f60417d647e4a17a6f57b64e498bb3b6d049608.
---
.../org/apache/camel/processor/aggregate/AggregateProcessor.java | 5 -----
1 file changed, 5 deletions(-)
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..18fc42c 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,11 +1448,6 @@ public class AggregateProcessor extends ServiceSupport implements AsyncProcessor
if (recoverService != null) {
camelContext.getExecutorServiceManager().shutdown(recoverService);
}
-
- if (timeoutCheckerExecutorService != null) {
- camelContext.getExecutorServiceManager().shutdownNow(timeoutCheckerExecutorService);
- }
-
ServiceHelper.stopServices(timeoutMap, processor, deadLetterProducerTemplate);
if (closedCorrelationKeys != null) {