Skip to content

S
spring-boot
Commit a34ff67a authored by Stephane Nicoll's avatar Stephane Nicoll
Browse files
Options

Merge branch '1.5.x'

parents ff3fe7a0 425c8bc4
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 6 deletions
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/JobLauncherCommandLineRunner.java
View file @ a34ff67a
...@@ -132,7 +132,6 @@ public class JobLauncherCommandLineRunner ...@@ -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,13 +143,11 @@ public class JobLauncherCommandLineRunner ...@@ -144,13 +143,11 @@ 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));
} }
} }
}
private void executeLocalJobs(JobParameters jobParameters) private void executeLocalJobs(JobParameters jobParameters)
throws JobExecutionException { throws JobExecutionException {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment