Skip to content

Commit a34ff67

Browse files
committed
Merge branch '1.5.x'
2 parents ff3fe7a + 425c8bc commit a34ff67

File tree

1 file changed

+3
-6
lines changed

1 file changed

+3
-6
lines changed

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,6 @@ private void executeRegisteredJobs(JobParameters jobParameters)
132132
}
133133
catch (NoSuchJobException ex) {
134134
logger.debug("No job found in registry for job name: " + jobName);
135-
continue;
136135
}
137136
}
138137
}
@@ -144,11 +143,9 @@ protected void execute(Job job, JobParameters jobParameters)
144143
JobParametersNotFoundException {
145144
JobParameters nextParameters = new JobParametersBuilder(jobParameters, this.jobExplorer)
146145
.getNextJobParameters(job).toJobParameters();
147-
if (nextParameters != null) {
148-
JobExecution execution = this.jobLauncher.run(job, nextParameters);
149-
if (this.publisher != null) {
150-
this.publisher.publishEvent(new JobExecutionEvent(execution));
151-
}
146+
JobExecution execution = this.jobLauncher.run(job, nextParameters);
147+
if (this.publisher != null) {
148+
this.publisher.publishEvent(new JobExecutionEvent(execution));
152149
}
153150
}
154151

0 commit comments

Comments
 (0)