Repository: storm Updated Branches: refs/heads/1.1.x-branch c9bbd5444 -> 080d9ddce
STORM-2779 NPE on shutting down WindowedBoltExecutor * waterMarkEventGenerator could be null when timestamp field is not specified Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/06599b6a Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/06599b6a Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/06599b6a Branch: refs/heads/1.1.x-branch Commit: 06599b6ab6311446c68dea6f35aab16e529e164f Parents: cb331d4 Author: Jungtaek Lim <[email protected]> Authored: Tue Oct 17 12:40:48 2017 +0900 Committer: Jungtaek Lim <[email protected]> Committed: Tue Oct 17 12:49:14 2017 +0900 ---------------------------------------------------------------------- .../src/jvm/org/apache/storm/topology/WindowedBoltExecutor.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/06599b6a/storm-core/src/jvm/org/apache/storm/topology/WindowedBoltExecutor.java ---------------------------------------------------------------------- diff --git a/storm-core/src/jvm/org/apache/storm/topology/WindowedBoltExecutor.java b/storm-core/src/jvm/org/apache/storm/topology/WindowedBoltExecutor.java index 26c69a2..c9afc67 100644 --- a/storm-core/src/jvm/org/apache/storm/topology/WindowedBoltExecutor.java +++ b/storm-core/src/jvm/org/apache/storm/topology/WindowedBoltExecutor.java @@ -299,7 +299,9 @@ public class WindowedBoltExecutor implements IRichBolt { @Override public void cleanup() { - waterMarkEventGenerator.shutdown(); + if (waterMarkEventGenerator != null) { + waterMarkEventGenerator.shutdown(); + } windowManager.shutdown(); bolt.cleanup(); }
