Browse Source

resolve shell task build command nullpointexception (#2267)

Co-authored-by: sunchaohe <sunzhaohe@linklogis.com>
pull/3/MERGE
孙朝和 5 years ago committed by gaojun2048
parent
commit
588c003860
  1. 9
      dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/shell/ShellTask.java

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

@ -133,7 +133,6 @@ public class ShellTask extends AbstractTask {
String script = shellParameters.getRawScript().replaceAll("\\r\\n", "\n"); String script = shellParameters.getRawScript().replaceAll("\\r\\n", "\n");
/** /**
* combining local and global parameters * combining local and global parameters
*/ */
@ -142,13 +141,9 @@ public class ShellTask extends AbstractTask {
shellParameters.getLocalParametersMap(), shellParameters.getLocalParametersMap(),
taskProps.getCmdTypeIfComplement(), taskProps.getCmdTypeIfComplement(),
taskProps.getScheduleTime()); 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 // 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); String dateTime = DateUtils.format(taskProps.getScheduleTime(), Constants.PARAMETER_FORMAT_TIME);
Property p = new Property(); Property p = new Property();
p.setValue(dateTime); p.setValue(dateTime);
@ -177,6 +172,4 @@ public class ShellTask extends AbstractTask {
return shellParameters; return shellParameters;
} }
} }

Loading…
Cancel
Save