Unverified Commit d8cba5ff authored by 孙朝和's avatar 孙朝和 Committed by GitHub
Browse files

resolve shell task build command nullpointexception (#2267) 



Co-authored-by: default avatarsunchaohe <sunzhaohe@linklogis.com>
parent efde8fd4

dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/shell/ShellTask.java

+1 −8
Original line number Diff line number Diff line
@@ -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;

  }







}