Merge branch '1.5.x'
This commit is contained in:
commit
a34ff67a1d
|
@ -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));
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue