[dolphinscheduler] branch 1.3.8-prepare updated: [FIX-#6007]Wrong complement date (#6020)

[kirs]

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

kirs pushed a commit to branch 1.3.8-prepare
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git


The following commit(s) were added to refs/heads/1.3.8-prepare by this push:
     new 5dd260e  [FIX-#6007]Wrong complement date (#6020)
5dd260e is described below

commit 5dd260ec77ab29a64061a9f20d0a25df0d80942c
Author: Kirs <acm_mas...@163.com>
AuthorDate: Mon Aug 23 11:16:45 2021 +0800

    [FIX-#6007]Wrong complement date (#6020)
---
 .../server/worker/task/spark/SparkTask.java                 | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git 
a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/spark/SparkTask.java
 
b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/spark/SparkTask.java
index f6fec0f..a4058fd 100644
--- 
a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/spark/SparkTask.java
+++ 
b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/spark/SparkTask.java
@@ -31,7 +31,10 @@ import org.apache.dolphinscheduler.server.utils.ParamUtils;
 import org.apache.dolphinscheduler.server.utils.SparkArgsUtils;
 import org.apache.dolphinscheduler.server.worker.task.AbstractYarnTask;
 
+import org.apache.commons.collections.MapUtils;
+
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -115,12 +118,16 @@ public class SparkTask extends AbstractYarnTask {
             sparkParameters.getLocalParametersMap(),
             CommandType.of(taskExecutionContext.getCmdTypeIfComplement()),
             taskExecutionContext.getScheduleTime());
+        if(MapUtils.isEmpty(paramsMap)){
+            paramsMap=new HashMap<>();
+        }
+        if (MapUtils.isNotEmpty(taskExecutionContext.getParamsMap())){
+            paramsMap.putAll(taskExecutionContext.getParamsMap());
+        }
 
         String command = null;
 
-        if (null != paramsMap) {
-            command = 
ParameterUtils.convertParameterPlaceholders(String.join(" ", args), 
ParamUtils.convert(paramsMap));
-        }
+        command = ParameterUtils.convertParameterPlaceholders(String.join(" ", 
args), ParamUtils.convert(paramsMap));
 
         logger.info("spark task command: {}", command);