SpringCloud/spring-cloud-task
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed NPE that would occur when using old constructor

Browse Source
This commit is contained in:
Michael Minella
2019-10-23 09:50:37 -05:00
parent 79719c541f
commit 338f19c9e9
1 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
spring-cloud-task-batch/src/main/java/org/springframework/cloud/task/batch/partition/DeployerPartitionHandler.java
View File

@@ -326,7 +326,15 @@ public class DeployerPartitionHandler
arguments.addAll(this.commandLineArgsProvider.getCommandLineArgs(copyContext));
TaskExecution partitionTaskExecution = this.taskRepository.createTaskExecution();
TaskExecution partitionTaskExecution = null;
if (this.taskRepository != null) {
partitionTaskExecution = this.taskRepository.createTaskExecution();
}
else {
logger.warn(
"TaskRepository was not set so external execution id will not be recorded.");
}
if (!this.defaultArgsAsEnvironmentVars) {
arguments.add(formatArgument(SPRING_CLOUD_TASK_JOB_EXECUTION_ID,
@@ -342,8 +350,11 @@ public class DeployerPartitionHandler
workerStepExecution.getStepName())));
arguments.add(formatArgument(SPRING_CLOUD_TASK_PARENT_EXECUTION_ID,
String.valueOf(this.taskExecution.getExecutionId())));
arguments.add(formatArgument(SPRING_CLOUD_TASK_EXECUTION_ID,
String.valueOf(partitionTaskExecution.getExecutionId())));
if (partitionTaskExecution != null) {
arguments.add(formatArgument(SPRING_CLOUD_TASK_EXECUTION_ID,
String.valueOf(partitionTaskExecution.getExecutionId())));
}
}
copyContext = new ExecutionContext(workerStepExecution.getExecutionContext());
@@ -376,8 +387,11 @@ public class DeployerPartitionHandler
this.deploymentProperties, arguments);
String externalExecutionId = this.taskLauncher.launch(request);
this.taskRepository.updateExternalExecutionId(
partitionTaskExecution.getExecutionId(), externalExecutionId);
if (this.taskRepository != null) {
this.taskRepository.updateExternalExecutionId(
partitionTaskExecution.getExecutionId(), externalExecutionId);
}
}
private String resolveApplicationName() {