This is an automated email from the ASF dual-hosted git repository.
leonbao pushed a commit to branch 1.3.4-prepare
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
The following commit(s) were added to refs/heads/1.3.4-prepare by this push:
new 047f55b Merge pull request #4088 from liliang1991/dev11_20 (#4154)
047f55b is described below
commit 047f55b79f84bc4f764b9a102afcbf9560983d3e
Author: lgcareer <[email protected]>
AuthorDate: Mon Dec 7 14:09:49 2020 +0800
Merge pull request #4088 from liliang1991/dev11_20 (#4154)
[Fix-4090][dao] Add null judgment
Co-authored-by: dailidong <[email protected]>
---
.../src/main/java/org/apache/dolphinscheduler/dao/utils/DagHelper.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/utils/DagHelper.java
b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/utils/DagHelper.java
index e2da27d..563f64f 100644
---
a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/utils/DagHelper.java
+++
b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/utils/DagHelper.java
@@ -256,7 +256,7 @@ public class DagHelper {
}
for (String dependNodeName : dependList) {
TaskNode dependNode = dag.getNode(dependNodeName);
- if (completeTaskList.containsKey(dependNodeName)
+ if (dependNode == null ||
completeTaskList.containsKey(dependNodeName)
|| dependNode.isForbidden()
|| skipTaskNodeList.containsKey(dependNodeName)) {
continue;