You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streams.apache.org by mf...@apache.org on 2014/08/18 18:10:26 UTC
[8/8] git commit: STREAMS-143 | Fixed accidental removal of
shutdownNow() call
STREAMS-143 | Fixed accidental removal of shutdownNow() call
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/c33f6654
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/c33f6654
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/c33f6654
Branch: refs/heads/master
Commit: c33f66544b7edb1dfc1ce09240a2b76542f6a74b
Parents: a01b691
Author: Ryan Ebanks <re...@Informations-MacBook-Pro-3.local>
Authored: Thu Aug 14 15:35:34 2014 -0500
Committer: Ryan Ebanks <re...@Informations-MacBook-Pro-3.local>
Committed: Thu Aug 14 15:35:34 2014 -0500
----------------------------------------------------------------------
.../src/main/java/org/apache/streams/util/ComponentUtils.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/c33f6654/streams-util/src/main/java/org/apache/streams/util/ComponentUtils.java
----------------------------------------------------------------------
diff --git a/streams-util/src/main/java/org/apache/streams/util/ComponentUtils.java b/streams-util/src/main/java/org/apache/streams/util/ComponentUtils.java
index 79ca184..9f3c480 100644
--- a/streams-util/src/main/java/org/apache/streams/util/ComponentUtils.java
+++ b/streams-util/src/main/java/org/apache/streams/util/ComponentUtils.java
@@ -94,6 +94,7 @@ public class ComponentUtils {
stream.shutdown();
try {
if (!stream.awaitTermination(initialWait, TimeUnit.SECONDS)) {
+ stream.shutdownNow();
if (!stream.awaitTermination(secondaryWait, TimeUnit.SECONDS)) {
LOGGER.error("Executor Service did not terminate");
}