You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2017/09/11 15:01:39 UTC
[1/2] storm git commit: [STORM-2729] Fix NPE in WorkerState
runWorkerStartHooks and runWorkerShutdownHooks methods
Repository: storm
Updated Branches:
refs/heads/master bf0f3a2fb -> ed6dca024
[STORM-2729] Fix NPE in WorkerState runWorkerStartHooks and runWorkerShutdownHooks methods
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/e7e11779
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/e7e11779
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/e7e11779
Branch: refs/heads/master
Commit: e7e1177992ba3a151d3162b8c6de041bf6708005
Parents: 9bf2022
Author: Ethan Li <et...@gmail.com>
Authored: Thu Sep 7 12:15:50 2017 -0500
Committer: Ethan Li <et...@gmail.com>
Committed: Thu Sep 7 12:15:50 2017 -0500
----------------------------------------------------------------------
.../apache/storm/daemon/worker/WorkerState.java | 22 +++++++++++---------
1 file changed, 12 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/e7e11779/storm-client/src/jvm/org/apache/storm/daemon/worker/WorkerState.java
----------------------------------------------------------------------
diff --git a/storm-client/src/jvm/org/apache/storm/daemon/worker/WorkerState.java b/storm-client/src/jvm/org/apache/storm/daemon/worker/WorkerState.java
index 1ab1255..d244491 100644
--- a/storm-client/src/jvm/org/apache/storm/daemon/worker/WorkerState.java
+++ b/storm-client/src/jvm/org/apache/storm/daemon/worker/WorkerState.java
@@ -583,20 +583,22 @@ public class WorkerState {
public void runWorkerStartHooks() {
WorkerTopologyContext workerContext = getWorkerTopologyContext();
- for (ByteBuffer hook : topology.get_worker_hooks()) {
- byte[] hookBytes = Utils.toByteArray(hook);
- BaseWorkerHook hookObject = Utils.javaDeserialize(hookBytes, BaseWorkerHook.class);
- hookObject.start(topologyConf, workerContext);
-
+ if (topology.is_set_worker_hooks()) {
+ for (ByteBuffer hook : topology.get_worker_hooks()) {
+ byte[] hookBytes = Utils.toByteArray(hook);
+ BaseWorkerHook hookObject = Utils.javaDeserialize(hookBytes, BaseWorkerHook.class);
+ hookObject.start(topologyConf, workerContext);
+ }
}
}
public void runWorkerShutdownHooks() {
- for (ByteBuffer hook : topology.get_worker_hooks()) {
- byte[] hookBytes = Utils.toByteArray(hook);
- BaseWorkerHook hookObject = Utils.javaDeserialize(hookBytes, BaseWorkerHook.class);
- hookObject.shutdown();
-
+ if (topology.is_set_worker_hooks()) {
+ for (ByteBuffer hook : topology.get_worker_hooks()) {
+ byte[] hookBytes = Utils.toByteArray(hook);
+ BaseWorkerHook hookObject = Utils.javaDeserialize(hookBytes, BaseWorkerHook.class);
+ hookObject.shutdown();
+ }
}
}
[2/2] storm git commit: Merge branch 'STORM-2729' of
https://github.com/Ethanlm/storm into STORM-2729
Posted by bo...@apache.org.
Merge branch 'STORM-2729' of https://github.com/Ethanlm/storm into STORM-2729
STORM-2729: Fix NPE in WorkerState runWorkerStartHooks and runWorkerShutdownHooks methods
This closes #2311
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/ed6dca02
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/ed6dca02
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/ed6dca02
Branch: refs/heads/master
Commit: ed6dca0246e053c443e6ecdbea1e08073ebbaff2
Parents: bf0f3a2 e7e1177
Author: Robert Evans <ev...@yahoo-inc.com>
Authored: Mon Sep 11 09:44:20 2017 -0500
Committer: Robert Evans <ev...@yahoo-inc.com>
Committed: Mon Sep 11 09:44:20 2017 -0500
----------------------------------------------------------------------
.../apache/storm/daemon/worker/WorkerState.java | 22 +++++++++++---------
1 file changed, 12 insertions(+), 10 deletions(-)
----------------------------------------------------------------------