Commit b640caa

committed

Use StoppableTasklet#stop(StepExecution) in SimpleJobOperator#stop(long executionId)

1 parent aedd19b commit b640caaCopy full SHA for b640caa

File tree

-2

lines changed

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

-2

lines changed

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -84,6 +84,7 @@`
`84`	`84`	`* @author Lucas Ward`
`85`	`85`	`* @author Will Schipp`
`86`	`86`	`* @author Mahmoud Ben Hassine`
	`87`	`+ * @author Hyunsang Han`
`87`	`88`	`* @since 2.0`
`88`	`89`	`*/`
`89`	`90`	`public class SimpleJobOperator implements JobOperator, InitializingBean {`
`@@ -350,7 +351,7 @@ public boolean stop(long executionId) throws NoSuchJobExecutionException, JobExe`
`350`	`351`	`Tasklet tasklet = ((TaskletStep) step).getTasklet();`
`351`	`352`	`if (tasklet instanceof StoppableTasklet) {`
`352`	`353`	`StepSynchronizationManager.register(stepExecution);`
`353`		`- ((StoppableTasklet) tasklet).stop();`
	`354`	`+ ((StoppableTasklet) tasklet).stop(stepExecution);`
`354`	`355`	`StepSynchronizationManager.release();`
`355`	`356`	`}`
`356`	`357`	`}`
`@@ -363,7 +364,7 @@ public boolean stop(long executionId) throws NoSuchJobExecutionException, JobExe`
`363`	`364`	`}`
`364`	`365`	`}`
`365`	`366`	`catch (NoSuchJobException e) {`
`366`		`- logger.warn("Cannot find Job object in the job registry. StoppableTasklet#stop() will not be called", e);`
	`367`	`+ logger.warn("Cannot find Job object in the job registry. StoppableTasklet#stop(StepExecution stepExecution) will not be called", e);`
`367`	`368`	`}`
`368`	`369`
`369`	`370`	`return true;`

Comments

(0)