You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by kn...@apache.org on 2016/03/24 21:43:10 UTC
[1/2] storm git commit: Made StormTimer join task thread on close
Repository: storm
Updated Branches:
refs/heads/master d3182c46c -> cb2735c23
Made StormTimer join task thread on close
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/d93b2f27
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/d93b2f27
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/d93b2f27
Branch: refs/heads/master
Commit: d93b2f272a6eea942702ab26c813c6a6d4d2af3f
Parents: e0b874f
Author: Stig Rohde Døssing <st...@gmail.com>
Authored: Tue Mar 22 02:04:53 2016 +0100
Committer: Stig Rohde Døssing <st...@gmail.com>
Committed: Tue Mar 22 02:04:53 2016 +0100
----------------------------------------------------------------------
storm-core/src/jvm/org/apache/storm/StormTimer.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/d93b2f27/storm-core/src/jvm/org/apache/storm/StormTimer.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/org/apache/storm/StormTimer.java b/storm-core/src/jvm/org/apache/storm/StormTimer.java
index 2874135..4be62b4 100644
--- a/storm-core/src/jvm/org/apache/storm/StormTimer.java
+++ b/storm-core/src/jvm/org/apache/storm/StormTimer.java
@@ -230,6 +230,7 @@ public class StormTimer implements AutoCloseable {
checkActive();
this.task.setActive(false);
this.task.interrupt();
+ this.task.join();
}
/**
[2/2] storm git commit: Merge branch 'fix-timer-shutdown-race' of
https://github.com/srdo/storm into asf-master
Posted by kn...@apache.org.
Merge branch 'fix-timer-shutdown-race' of https://github.com/srdo/storm into asf-master
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/cb2735c2
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/cb2735c2
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/cb2735c2
Branch: refs/heads/master
Commit: cb2735c237fa9c38a579f1315b40bf1bfb12895a
Parents: d3182c4 d93b2f2
Author: Kyle Nusbaum <Ky...@gmail.com>
Authored: Thu Mar 24 15:41:07 2016 -0500
Committer: Kyle Nusbaum <Ky...@gmail.com>
Committed: Thu Mar 24 15:41:07 2016 -0500
----------------------------------------------------------------------
storm-core/src/jvm/org/apache/storm/StormTimer.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------