[incubator-dolphinscheduler] branch dev updated: fix: NullPointException in the case of task queuing (#2175)

[lidongdai]

This is an automated email from the ASF dual-hosted git repository.

lidongdai pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git


The following commit(s) were added to refs/heads/dev by this push:
     new e0389ae  fix: NullPointException in the case of task queuing (#2175)
e0389ae is described below

commit e0389aebf6416c90f31ec0f6a4ff5a5d94cfecfb
Author: Rubik-W <39549317+rubi...@users.noreply.github.com>
AuthorDate: Sat Mar 14 19:20:46 2020 +0800

    fix: NullPointException in the case of task queuing (#2175)
---
 .../apache/dolphinscheduler/server/master/runner/MasterExecThread.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterExecThread.java
 
b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterExecThread.java
index 849bbd5..0c44b7a 100644
--- 
a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterExecThread.java
+++ 
b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterExecThread.java
@@ -1062,7 +1062,7 @@ public class MasterExecThread implements Runnable {
 
             TaskInstance taskInstance = taskExecThread.getTaskInstance();
             taskInstance = 
processService.findTaskInstanceById(taskInstance.getId());
-            if(taskInstance.getState().typeIsFinished()){
+            if(taskInstance != null && 
taskInstance.getState().typeIsFinished()){
                 continue;
             }