You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2017/06/29 12:08:13 UTC
[2/2] camel git commit: Fixed CS
Fixed CS
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/bde5691a
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/bde5691a
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/bde5691a
Branch: refs/heads/master
Commit: bde5691a82d49f0de5fcdcd87df6bef8aa1884cb
Parents: cfd4e02
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Jun 29 14:07:05 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Jun 29 14:07:05 2017 +0200
----------------------------------------------------------------------
.../main/java/org/apache/camel/impl/DefaultShutdownStrategy.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/bde5691a/camel-core/src/main/java/org/apache/camel/impl/DefaultShutdownStrategy.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultShutdownStrategy.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultShutdownStrategy.java
index f06b52b..304c492 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultShutdownStrategy.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultShutdownStrategy.java
@@ -197,7 +197,8 @@ public class DefaultShutdownStrategy extends ServiceSupport implements ShutdownS
// use another thread to perform the shutdowns so we can support timeout
timeoutOccurred.set(false);
- currentShutdownTaskFuture = getExecutorService().submit(new ShutdownTask(context, routesOrdered, timeout, timeUnit, suspendOnly, abortAfterTimeout, timeoutOccurred, isLogInflightExchangesOnTimeout()));
+ currentShutdownTaskFuture = getExecutorService().submit(new ShutdownTask(context, routesOrdered, timeout, timeUnit, suspendOnly,
+ abortAfterTimeout, timeoutOccurred, isLogInflightExchangesOnTimeout()));
try {
currentShutdownTaskFuture.get(timeout, timeUnit);
} catch (ExecutionException e) {