Repository: storm Updated Branches: refs/heads/master 914abe59b -> 7b940aed6
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/e69fbc51 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/e69fbc51 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/e69fbc51 Branch: refs/heads/master Commit: e69fbc51ada2fd542d717bbd7623c39f4f6a1cb8 Parents: c8947c2 Author: Jungtaek Lim <[email protected]> Authored: Tue Oct 17 12:40:48 2017 +0900 Committer: Jungtaek Lim <[email protected]> Committed: Tue Oct 17 12:40:48 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/e69fbc51/storm-client/src/jvm/org/apache/storm/topology/WindowedBoltExecutor.java ---------------------------------------------------------------------- diff --git a/storm-client/src/jvm/org/apache/storm/topology/WindowedBoltExecutor.java b/storm-client/src/jvm/org/apache/storm/topology/WindowedBoltExecutor.java index 15faefb..5089f64 100644 --- a/storm-client/src/jvm/org/apache/storm/topology/WindowedBoltExecutor.java +++ b/storm-client/src/jvm/org/apache/storm/topology/WindowedBoltExecutor.java @@ -327,7 +327,9 @@ public class WindowedBoltExecutor implements IRichBolt { @Override public void cleanup() { - waterMarkEventGenerator.shutdown(); + if (waterMarkEventGenerator != null) { + waterMarkEventGenerator.shutdown(); + } windowManager.shutdown(); bolt.cleanup(); }
