You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by le...@apache.org on 2021/12/29 02:58:33 UTC
[dolphinscheduler] branch dev updated: [Fix-7062][MasterServer] NPE when run switch conditions sub-process (#7687)
This is an automated email from the ASF dual-hosted git repository.
leonbao 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 9a1cea4 [Fix-7062][MasterServer] NPE when run switch conditions sub-process (#7687)
9a1cea4 is described below
commit 9a1cea402e6fae6477c23372fdea26094e170c17
Author: aaronlinv <15...@qq.com>
AuthorDate: Wed Dec 29 10:58:23 2021 +0800
[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 594fa29..7a7fe29 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 ed47063..50ddaeb 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 e162613..1afd211 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);;