[dolphinscheduler] branch dev updated: [Fix-14828][master] check task id not null to avoid NPE (#14829)

[caishunfeng]

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

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


The following commit(s) were added to refs/heads/dev by this push:
     new 33525a17c3 [Fix-14828][master] check task id not null to avoid NPE 
(#14829)
33525a17c3 is described below

commit 33525a17c3463d4bde56ae2335ecec38b24a5a6a
Author: eye-gu <734164...@qq.com>
AuthorDate: Thu Aug 31 18:34:31 2023 +0800

    [Fix-14828][master] check task id not null to avoid NPE (#14829)
    
    Co-authored-by: eye <eye...@aloudata.com>
    Co-authored-by: Aaron Wang <wangweira...@gmail.com>
    Co-authored-by: caishunfeng <caishunfeng2...@gmail.com>
---
 .../dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java
 
b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java
index 9c5e65160f..12fed3ab56 100644
--- 
a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java
+++ 
b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java
@@ -1897,7 +1897,7 @@ public class WorkflowExecuteRunnable implements 
IWorkflowExecuteRunnable {
         TaskInstance task;
         while ((task = readyToSubmitTaskQueue.peek()) != null) {
             // stop tasks which is retrying if forced success happens
-            if (task.taskCanRetry()) {
+            if (task.getId() != null && task.taskCanRetry()) {
                 TaskInstance retryTask = 
taskInstanceDao.queryById(task.getId());
                 if (retryTask != null && 
retryTask.getState().isForceSuccess()) {
                     task.setState(retryTask.getState());