You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by sr...@apache.org on 2018/06/17 16:02:39 UTC
[1/2] storm git commit: STORM-3103 allow nimbus to shutdown properly
Repository: storm
Updated Branches:
refs/heads/master 1e3ab3ac3 -> 15a9a3bac
STORM-3103 allow nimbus to shutdown properly
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/5c5d0713
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/5c5d0713
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/5c5d0713
Branch: refs/heads/master
Commit: 5c5d071305785fb322413b0a39d3fb6d19a83a9d
Parents: 0cb6590
Author: Aaron Gresch <ag...@yahoo-inc.com>
Authored: Wed Jun 13 15:31:15 2018 -0500
Committer: Aaron Gresch <ag...@yahoo-inc.com>
Committed: Wed Jun 13 15:31:15 2018 -0500
----------------------------------------------------------------------
storm-client/src/jvm/org/apache/storm/StormTimer.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/5c5d0713/storm-client/src/jvm/org/apache/storm/StormTimer.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/StormTimer.java b/storm-client/src/jvm/org/apache/storm/StormTimer.java
index e8126e3..bcd39d3 100644
--- a/storm-client/src/jvm/org/apache/storm/StormTimer.java
+++ b/storm-client/src/jvm/org/apache/storm/StormTimer.java
@@ -35,7 +35,6 @@ public class StormTimer implements AutoCloseable {
*
* @param name name of the timer
* @param onKill function to call when timer is killed unexpectedly
- * @return StormTimerTask object that was initialized
*/
public StormTimer(String name, Thread.UncaughtExceptionHandler onKill) {
if (onKill == null) {
@@ -67,7 +66,7 @@ public class StormTimer implements AutoCloseable {
}
/**
- * Same as schedule with millisecond resolution
+ * Same as schedule with millisecond resolution.
*
* @param delayMs the number of milliseconds to delay before running the function
* @param func the function to run
@@ -249,8 +248,9 @@ public class StormTimer implements AutoCloseable {
} catch (Throwable e) {
if (!(Utils.exceptionCauseIsInstanceOf(InterruptedException.class, e))
&& !(Utils.exceptionCauseIsInstanceOf(ClosedByInterruptException.class, e))) {
- this.onKill.uncaughtException(this, e);
+ // need to set active false before calling onKill() - current implementation does not return.
this.setActive(false);
+ this.onKill.uncaughtException(this, e);
}
}
}
[2/2] storm git commit: Merge branch 'agresch_timer' of
https://github.com/agresch/storm into STORM-3103-merge
Posted by sr...@apache.org.
Merge branch 'agresch_timer' of https://github.com/agresch/storm into STORM-3103-merge
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/15a9a3ba
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/15a9a3ba
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/15a9a3ba
Branch: refs/heads/master
Commit: 15a9a3bac57ea92e0df56390289ad4de1f43bc80
Parents: 1e3ab3a 5c5d071
Author: Stig Rohde Døssing <sr...@apache.org>
Authored: Sun Jun 17 17:56:45 2018 +0200
Committer: Stig Rohde Døssing <sr...@apache.org>
Committed: Sun Jun 17 17:56:45 2018 +0200
----------------------------------------------------------------------
storm-client/src/jvm/org/apache/storm/StormTimer.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------