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/09/06 08:39:21 UTC

[dolphinscheduler] branch json_split_two updated: [Feature][JsonSplit-api] fix some bug in joint commissioning (#6108)

This is an automated email from the ASF dual-hosted git repository.

leonbao pushed a commit to branch json_split_two
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git


The following commit(s) were added to refs/heads/json_split_two by this push:
     new 537af05  [Feature][JsonSplit-api] fix some bug in joint commissioning (#6108)
537af05 is described below

commit 537af052f07f5087a2a51918413268b3371df18b
Author: JinyLeeChina <42...@users.noreply.github.com>
AuthorDate: Mon Sep 6 16:39:17 2021 +0800

    [Feature][JsonSplit-api] fix some bug in joint commissioning (#6108)
    
    * refactor method of task save
    
    * fix ut
    
    * fix ut
    
    * update method of processDefinition
    
    * fix ut
    
    * fix some bug in joint commissioning
    
    * reomve connects field from h2
    
    * fix bug in joint commissioning
    
    Co-authored-by: JinyLeeChina <29...@qq.com>
---
 .../org/apache/dolphinscheduler/service/process/ProcessService.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 528eef1..d83f986 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
@@ -2309,8 +2309,8 @@ public class ProcessService {
             v.setMaxRetryTimes(taskDefinitionLog.getFailRetryTimes());
             v.setRetryInterval(taskDefinitionLog.getFailRetryInterval());
             Map<String, Object> taskParamsMap = v.taskParamsToJsonObj(taskDefinitionLog.getTaskParams());
-            v.setConditionResult((String) taskParamsMap.get(Constants.CONDITION_RESULT));
-            v.setDependence((String) taskParamsMap.get(Constants.DEPENDENCE));
+            v.setConditionResult(JSONUtils.toJsonString(taskParamsMap.get(Constants.CONDITION_RESULT)));
+            v.setDependence(JSONUtils.toJsonString(taskParamsMap.get(Constants.DEPENDENCE)));
             taskParamsMap.remove(Constants.CONDITION_RESULT);
             taskParamsMap.remove(Constants.DEPENDENCE);
             v.setParams(JSONUtils.toJsonString(taskParamsMap));