Commit e2dcee1

committed

avoid warning when job parameters are empty with incrementer

Closes: gh-4914 Signed-off-by: Andrey Litvitski <andrey1010102008@gmail.com>

1 parent ff90464 commit e2dcee1Copy full SHA for e2dcee1

File tree

-1

lines changed

spring-batch-core/src/main/java/org/springframework/batch/core/launch/support
- SimpleJobOperator.java

-1

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -80,6 +80,7 @@`
`80`	`80`	`* @author Lucas Ward`
`81`	`81`	`* @author Will Schipp`
`82`	`82`	`* @author Mahmoud Ben Hassine`
	`83`	`+ * @author Andrey Litvitski`
`83`	`84`	`* @since 2.0`
`84`	`85`	`* @deprecated since 6.0 in favor of {@link TaskExecutorJobOperator}. Scheduled for`
`85`	`86`	`* removal in 6.2 or later.`
`@@ -187,7 +188,7 @@ public JobExecution start(Job job, JobParameters jobParameters)`
`187`	`188`	`JobRestartException, JobParametersInvalidException {`
`188`	`189`	`Assert.notNull(job, "The Job must not be null.");`
`189`	`190`	`Assert.notNull(jobParameters, "The JobParameters must not be null.");`
`190`		`- if (job.getJobParametersIncrementer() != null) {`
	`191`	`+ if (job.getJobParametersIncrementer() != null && !jobParameters.isEmpty()) {`
`191`	`192`	`if (logger.isWarnEnabled()) {`
`192`	`193`	`logger.warn(String.format(`
`193`	`194`	`"Attempting to launch job '%s' which defines an incrementer with additional parameters={%s}. Those additional parameters will be ignored.",`

Comments

(0)