root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Merge branch '1.5.x'

This commit is contained in:
Stephane Nicoll 2017-10-28 07:58:45 +02:00
parent ff3fe7a09f 425c8bc4a9
commit a34ff67a1d
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -132,7 +132,6 @@ public class JobLauncherCommandLineRunner
} }
catch (NoSuchJobException ex) { catch (NoSuchJobException ex) {
logger.debug("No job found in registry for job name: " + jobName); logger.debug("No job found in registry for job name: " + jobName);
continue;
} }
} }
} }
@ -144,11 +143,9 @@ public class JobLauncherCommandLineRunner
JobParametersNotFoundException { JobParametersNotFoundException {
JobParameters nextParameters = new JobParametersBuilder(jobParameters, this.jobExplorer) JobParameters nextParameters = new JobParametersBuilder(jobParameters, this.jobExplorer)
.getNextJobParameters(job).toJobParameters(); .getNextJobParameters(job).toJobParameters();
if (nextParameters != null) { JobExecution execution = this.jobLauncher.run(job, nextParameters);
JobExecution execution = this.jobLauncher.run(job, nextParameters); if (this.publisher != null) {
if (this.publisher != null) { this.publisher.publishEvent(new JobExecutionEvent(execution));
this.publisher.publishEvent(new JobExecutionEvent(execution));
}
} }
} }