From 9a1cea402e6fae6477c23372fdea26094e170c17 Mon Sep 17 00:00:00 2001 From: aaronlinv <1546848781@qq.com> Date: Wed, 29 Dec 2021 10:58:23 +0800 Subject: [PATCH] [Fix-7062][MasterServer] NPE when run switch conditions sub-process (#7687) --- .../server/master/runner/task/ConditionTaskProcessor.java | 2 -- .../server/master/runner/task/SubTaskProcessor.java | 2 -- .../server/master/runner/task/SwitchTaskProcessor.java | 6 ------ 3 files changed, 10 deletions(-) diff --git a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/task/ConditionTaskProcessor.java b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/task/ConditionTaskProcessor.java index 594fa29c23..7a7fe29dbb 100644 --- a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/task/ConditionTaskProcessor.java +++ b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/task/ConditionTaskProcessor.java @@ -50,8 +50,6 @@ public class ConditionTaskProcessor extends BaseTaskProcessor { */ private DependentParameters dependentParameters; - ProcessInstance processInstance; - /** * condition result */ diff --git a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/task/SubTaskProcessor.java b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/task/SubTaskProcessor.java index ed470633ab..50ddaeb649 100644 --- a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/task/SubTaskProcessor.java +++ b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/task/SubTaskProcessor.java @@ -36,8 +36,6 @@ import java.util.concurrent.locks.ReentrantLock; */ public class SubTaskProcessor extends BaseTaskProcessor { - private ProcessInstance processInstance; - private ProcessInstance subProcessInstance = null; private TaskDefinition taskDefinition; diff --git a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/task/SwitchTaskProcessor.java b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/task/SwitchTaskProcessor.java index e162613f3d..1afd211504 100644 --- a/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/task/SwitchTaskProcessor.java +++ b/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/task/SwitchTaskProcessor.java @@ -44,9 +44,6 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.stream.Collectors; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - /** * switch task processor */ @@ -54,9 +51,6 @@ public class SwitchTaskProcessor extends BaseTaskProcessor { protected final String rgex = "['\"]*\\$\\{(.*?)\\}['\"]*"; - private TaskInstance taskInstance; - - private ProcessInstance processInstance; TaskDefinition taskDefinition; private MasterConfig masterConfig = SpringApplicationContext.getBean(MasterConfig.class);;