Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10612 from mdeinum:master

Browse Source 
* pr/10612:
  Polish JobLauncherCommandLineRunner
This commit is contained in:
Stephane Nicoll
2017-10-28 07:57:42 +02:00
parent 51551feace ab3d65ccae
commit 425c8bc4a9
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/JobLauncherCommandLineRunner.java
View File

@@ -181,8 +181,7 @@ public class JobLauncherCommandLineRunner
Map<String, JobParameter> merged = new HashMap<String, JobParameter>();
merged.putAll(parameters.getParameters());
merged.putAll(additionals);
parameters = new JobParameters(merged);
return parameters;
return new JobParameters(merged);
}
private void executeRegisteredJobs(JobParameters jobParameters)
@@ -199,7 +198,6 @@ public class JobLauncherCommandLineRunner
}
catch (NoSuchJobException ex) {
logger.debug("No job found in registry for job name: " + jobName);
continue;
}
}
}
@@ -210,11 +208,9 @@ public class JobLauncherCommandLineRunner
JobInstanceAlreadyCompleteException, JobParametersInvalidException,
JobParametersNotFoundException {
JobParameters nextParameters = getNextJobParameters(job, jobParameters);
if (nextParameters != null) {
JobExecution execution = this.jobLauncher.run(job, nextParameters);
if (this.publisher != null) {
this.publisher.publishEvent(new JobExecutionEvent(execution));
}
JobExecution execution = this.jobLauncher.run(job, nextParameters);
if (this.publisher != null) {
this.publisher.publishEvent(new JobExecutionEvent(execution));
}
}