Merge branch 'STORM-2979-master' of https://github.com/hummelm/storm into STORM-2979-merge
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/8120e15e Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/8120e15e Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/8120e15e Branch: refs/heads/master Commit: 8120e15eff36a1415a6590297f682458c783dd1e Parents: 26818f2 d9a3693 Author: Jungtaek Lim <kabh...@gmail.com> Authored: Tue Apr 10 19:05:08 2018 +0900 Committer: Jungtaek Lim <kabh...@gmail.com> Committed: Tue Apr 10 19:05:08 2018 +0900 ---------------------------------------------------------------------- .../apache/storm/daemon/worker/WorkerState.java | 32 +++++++++++++------- 1 file changed, 21 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/8120e15e/storm-client/src/jvm/org/apache/storm/daemon/worker/WorkerState.java ---------------------------------------------------------------------- diff --cc storm-client/src/jvm/org/apache/storm/daemon/worker/WorkerState.java index fc94086,e709d04..0bdf8ba --- a/storm-client/src/jvm/org/apache/storm/daemon/worker/WorkerState.java +++ b/storm-client/src/jvm/org/apache/storm/daemon/worker/WorkerState.java @@@ -95,8 -95,13 +95,13 @@@ public class WorkerState final IContext mqContext; private final WorkerTransfer workerTransfer; private final BackPressureTracker bpTracker; + private final List<IWorkerHook> deserializedWorkerHooks; + + public List<IWorkerHook> getDeserializedWorkerHooks() { + return deserializedWorkerHooks; + } - public Map getConf() { + public Map<String, Object> getConf() { return conf; }