From 8694b9c8f989eb5c6b0792e5901cba2a207cdcf0 Mon Sep 17 00:00:00 2001
From: OS <29528966+lenboo@users.noreply.github.com>
Date: Wed, 15 Sep 2021 10:29:26 +0800
Subject: [PATCH] fix bug-6208 json parse error in sub process (#6211)

---
 .../apache/dolphinscheduler/common/Constants.java   |  1 +
 .../dolphinscheduler/common/model/TaskNode.java     | 13 +++++++++++++
 2 files changed, 14 insertions(+)

diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/Constants.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/Constants.java
index dc11051efc..4f9aca5df7 100644
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/Constants.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/Constants.java
@@ -755,6 +755,7 @@ public final class Constants {
     public static final String PARENT_WORKFLOW_INSTANCE = "parentWorkflowInstance";
     public static final String CONDITION_RESULT = "conditionResult";
     public static final String SWITCH_RESULT = "switchResult";
+    public static final String WAIT_START_TIMEOUT = "waitStartTimeout";
     public static final String DEPENDENCE = "dependence";
     public static final String TASK_TYPE = "taskType";
     public static final String TASK_LIST = "taskList";
diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/model/TaskNode.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/model/TaskNode.java
index d43e1f9710..e9712630f1 100644
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/model/TaskNode.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/model/TaskNode.java
@@ -134,6 +134,10 @@ public class TaskNode {
     @JsonSerialize(using = JSONUtils.JsonDataSerializer.class)
     private String switchResult;
 
+    @JsonDeserialize(using = JSONUtils.JsonDataDeserializer.class)
+    @JsonSerialize(using = JSONUtils.JsonDataSerializer.class)
+    private String waitStartTimeout;
+
     /**
      * task instance priority
      */
@@ -396,6 +400,7 @@ public class TaskNode {
         taskParams.put(Constants.CONDITION_RESULT, this.conditionResult);
         taskParams.put(Constants.DEPENDENCE, this.dependence);
         taskParams.put(Constants.SWITCH_RESULT, this.switchResult);
+        taskParams.put(Constants.WAIT_START_TIMEOUT, this.waitStartTimeout);
         return JSONUtils.toJsonString(taskParams);
     }
 
@@ -450,4 +455,12 @@ public class TaskNode {
     public void setSwitchResult(String switchResult) {
         this.switchResult = switchResult;
     }
+
+    public String getWaitStartTimeout() {
+        return this.waitStartTimeout;
+    }
+
+    public void setWaitStartTimeout(String waitStartTimeout) {
+        this.waitStartTimeout = waitStartTimeout;
+    }
 }