[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/4b19e272 Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/4b19e272 Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/4b19e272 Branch: refs/heads/table-retraction Commit: 4b19e272043907b70791bff8a85bd493e212947c Parents: 11fe3dc Author: Ufuk Celebi <u...@apache.org> Authored: Fri Mar 24 12:24:19 2017 +0100 Committer: Ufuk Celebi <u...@apache.org> Committed: Fri Mar 24 12:26:54 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/4b19e272/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 63b40ad..1829140 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(); + } } }
