提交 a27a45fc 编写于 作者: a9236229028's avatar a9236229028 提交者: Jiajie Zhong

[fix][master]: fix condition npe (#10478)

* [fix][master]: fix condition npe

* [fix][master]: fix condition npe
Co-authored-by: Nhuaangcg <huangcg@getui.com>
(cherry picked from commit 0dd6f400)
上级 64b72a29
...@@ -39,6 +39,7 @@ import java.util.HashSet; ...@@ -39,6 +39,7 @@ import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.Optional;
import org.apache.dolphinscheduler.spi.utils.StringUtils; import org.apache.dolphinscheduler.spi.utils.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
...@@ -375,9 +376,13 @@ public class DagHelper { ...@@ -375,9 +376,13 @@ public class DagHelper {
} else { } else {
conditionTaskList.add(nodeCode); conditionTaskList.add(nodeCode);
} }
// the skipNodeList maybe null if no next task
skipNodeList = Optional.ofNullable(skipNodeList).orElse(new ArrayList<>());
for (String failedNode : skipNodeList) { for (String failedNode : skipNodeList) {
setTaskNodeSkip(failedNode, dag, completeTaskList, skipTaskNodeList); setTaskNodeSkip(failedNode, dag, completeTaskList, skipTaskNodeList);
} }
// the conditionTaskList maybe null if no next task
conditionTaskList = Optional.ofNullable(conditionTaskList).orElse(new ArrayList<>());
return conditionTaskList; return conditionTaskList;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册