[incubator-dolphinscheduler] branch dev updated: resolve shell task build command nullpointexception (#2267)

[lidongdai]

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

lidongdai pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git


The following commit(s) were added to refs/heads/dev by this push:
     new d8cba5f  resolve shell task build command nullpointexception (#2267)
d8cba5f is described below

commit d8cba5ff1ba4be74e99397b80bca521bff60ffb1
Author: 孙朝和 <649790...@qq.com>
AuthorDate: Thu Mar 26 23:25:15 2020 +0800

    resolve shell task build command nullpointexception (#2267)
    
    Co-authored-by: sunchaohe <sunzha...@linklogis.com>
---
 .../dolphinscheduler/server/worker/task/shell/ShellTask.java     | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git 
a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/shell/ShellTask.java
 
b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/shell/ShellTask.java
index 2c8433a..165430b 100644
--- 
a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/shell/ShellTask.java
+++ 
b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/shell/ShellTask.java
@@ -134,7 +134,6 @@ public class ShellTask extends AbstractTask {
 
     String script = shellParameters.getRawScript().replaceAll("\\r\\n", "\n");
 
-
     /**
      *  combining local and global parameters
      */
@@ -143,13 +142,9 @@ public class ShellTask extends AbstractTask {
             shellParameters.getLocalParametersMap(),
             taskProps.getCmdTypeIfComplement(),
             taskProps.getScheduleTime());
-//    if (paramsMap != null){
-//      script = ParameterUtils.convertParameterPlaceholders(script, 
ParamUtils.convert(paramsMap));
-//    }
 
-    //new
 //    replace variable TIME with $[YYYYmmddd...] in shell file when history 
run job and batch complement job
-    if (paramsMap != null) {
+    if(paramsMap != null && taskProps.getScheduleTime()!=null) {
       String dateTime = DateUtils.format(taskProps.getScheduleTime(), 
Constants.PARAMETER_FORMAT_TIME);
       Property p = new Property();
       p.setValue(dateTime);
@@ -182,6 +177,4 @@ public class ShellTask extends AbstractTask {
     return shellParameters;
   }
 
-
-
 }