You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by rm...@apache.org on 2015/02/17 10:15:42 UTC

flink git commit: Fix NullPointerException in TaskManager

Repository: flink
Updated Branches:
  refs/heads/release-0.8 eec39a2da -> af50e5619


Fix NullPointerException in TaskManager


Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/af50e561
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/af50e561
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/af50e561

Branch: refs/heads/release-0.8
Commit: af50e561982c6c8dbf2189541cb765187b6a72f8
Parents: eec39a2
Author: Robert Metzger <rm...@apache.org>
Authored: Mon Feb 16 16:04:18 2015 +0100
Committer: Robert Metzger <rm...@apache.org>
Committed: Mon Feb 16 16:04:39 2015 +0100

----------------------------------------------------------------------
 .../java/org/apache/flink/runtime/taskmanager/TaskManager.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/af50e561/flink-runtime/src/main/java/org/apache/flink/runtime/taskmanager/TaskManager.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/taskmanager/TaskManager.java b/flink-runtime/src/main/java/org/apache/flink/runtime/taskmanager/TaskManager.java
index 267c63e..36103f9 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/taskmanager/TaskManager.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/taskmanager/TaskManager.java
@@ -656,7 +656,9 @@ public class TaskManager implements TaskOperationProtocol {
 			
 			try {
 				try {
-					task.failExternally(t);
+					if(task != null) {
+						task.failExternally(t);
+					}
 				}
 				catch (Throwable t2) {
 					LOG.error("Error during cleanup of task deployment", t2);