Repository: flink Updated Branches: refs/heads/master 211f5db9d -> 3ce8596b4
[FLINK-4631] Prevent NPE in OneInputStreamTask This closes #2709. Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/3ce8596b Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/3ce8596b Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/3ce8596b Branch: refs/heads/master Commit: 3ce8596b43f88b2b6d51dab687ab224a43b825fb Parents: 211f5db Author: Aleksandr Chermenin <[email protected]> Authored: Fri Oct 28 12:36:01 2016 +0300 Committer: zentol <[email protected]> Committed: Fri Oct 28 13:34:31 2016 +0200 ---------------------------------------------------------------------- .../apache/flink/streaming/runtime/tasks/OneInputStreamTask.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/3ce8596b/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/OneInputStreamTask.java ---------------------------------------------------------------------- diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/OneInputStreamTask.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/OneInputStreamTask.java index 2e73e42..0f8f4a4 100644 --- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/OneInputStreamTask.java +++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/OneInputStreamTask.java @@ -69,7 +69,9 @@ public class OneInputStreamTask<IN, OUT> extends StreamTask<OUT, OneInputStreamO @Override protected void cleanup() throws Exception { - inputProcessor.cleanup(); + if (inputProcessor != null) { + inputProcessor.cleanup(); + } } @Override
