Repository: flink Updated Branches: refs/heads/release-1.2 b99883430 -> b703a24d4
[FLINK-6182] Fix possible NPE in SourceStreamTask This closes #3606. Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/b703a24d Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/b703a24d Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/b703a24d Branch: refs/heads/release-1.2 Commit: b703a24d41510d35a681db9382c19556bde05b23 Parents: b998834 Author: Ufuk Celebi <[email protected]> Authored: Fri Mar 24 12:24:19 2017 +0100 Committer: Ufuk Celebi <[email protected]> Committed: Fri Mar 24 12:27:48 2017 +0100 ---------------------------------------------------------------------- .../apache/flink/streaming/runtime/tasks/SourceStreamTask.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/b703a24d/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/SourceStreamTask.java ---------------------------------------------------------------------- diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/SourceStreamTask.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/SourceStreamTask.java index 7ae99f6..5a87102 100644 --- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/SourceStreamTask.java +++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/runtime/tasks/SourceStreamTask.java @@ -58,6 +58,8 @@ public class SourceStreamTask<OUT, SRC extends SourceFunction<OUT>, OP extends S @Override protected void cancelTask() throws Exception { - headOperator.cancel(); + if (headOperator != null) { + headOperator.cancel(); + } } }
