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/11/15 14:31:12 UTC
[dolphinscheduler] branch 2.0.0-release-prepare updated: [Feature][Master] change sub process id to code (#6858) (#6859)
This is an automated email from the ASF dual-hosted git repository.
leonbao pushed a commit to branch 2.0.0-release-prepare
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
The following commit(s) were added to refs/heads/2.0.0-release-prepare by this push:
new 03e62dc [Feature][Master] change sub process id to code (#6858) (#6859)
03e62dc is described below
commit 03e62dc4344cac9bd510eae438c6428f3eafda63
Author: OS <29...@users.noreply.github.com>
AuthorDate: Mon Nov 15 22:31:03 2021 +0800
[Feature][Master] change sub process id to code (#6858) (#6859)
* feature 6597 change sub process id to code
* feature 6597 change sub process id to code
---
.../org/apache/dolphinscheduler/service/process/ProcessService.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java b/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
index 10621af..81bad0b 100644
--- a/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
+++ b/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
@@ -1209,7 +1209,10 @@ public class ProcessService {
TaskInstance task) {
CommandType commandType = getSubCommandType(parentProcessInstance, childInstance);
Map<String, String> subProcessParam = JSONUtils.toMap(task.getTaskParams());
- int childDefineCode = Integer.parseInt(subProcessParam.get(Constants.CMD_PARAM_SUB_PROCESS_DEFINE_CODE));
+ long childDefineCode = 0L;
+ if (subProcessParam.containsKey(Constants.CMD_PARAM_SUB_PROCESS_DEFINE_CODE)) {
+ childDefineCode = Long.parseLong(subProcessParam.get(Constants.CMD_PARAM_SUB_PROCESS_DEFINE_CODE));
+ }
ProcessDefinition subProcessDefinition = processDefineMapper.queryByCode(childDefineCode);
Object localParams = subProcessParam.get(Constants.LOCAL_PARAMS);