This is an automated email from the ASF dual-hosted git repository.
kerwin pushed a commit to branch 3.1.2-prepare
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
The following commit(s) were added to refs/heads/3.1.2-prepare by this push:
new d4c6ec4fa1 [Bug-12963] [Master] Fix dependent task node null pointer
exception (#12965)
d4c6ec4fa1 is described below
commit d4c6ec4fa1e55394ebb769cb21afb2894a152bb2
Author: Kerwin <[email protected]>
AuthorDate: Thu Nov 24 19:00:46 2022 +0800
[Bug-12963] [Master] Fix dependent task node null pointer exception (#12965)
* Fix that there are both manual and scheduled workflow instances in
dependent nodes, and one of them will report a null pointer exception during
execution.
---
.../apache/dolphinscheduler/server/master/utils/DependentExecute.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/utils/DependentExecute.java
b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/utils/DependentExecute.java
index 1312bc0b61..aaad08320a 100644
---
a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/utils/DependentExecute.java
+++
b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/utils/DependentExecute.java
@@ -199,8 +199,8 @@ public class DependentExecute {
return lastManualProcess;
}
- return
(lastManualProcess.getEndTime().after(lastSchedulerProcess.getEndTime())) ?
lastManualProcess
- : lastSchedulerProcess;
+ // In the time range, there are both manual and scheduled workflow
instances, return the last workflow instance
+ return lastManualProcess.getId() > lastSchedulerProcess.getId() ?
lastManualProcess : lastSchedulerProcess;
}
/**
