Check if job is stopping before checking interrupt

Author: uyw4687

spring-batch-core/src/main/java/org/springframework/batch/core/step/tasklet/TaskletStep.java

@@ -19,6 +19,7 @@
 import org.apache.commons.logging.LogFactory;
 import org.springframework.batch.core.BatchStatus;
 import org.springframework.batch.core.ChunkListener;
+import org.springframework.batch.core.JobExecution;
 import org.springframework.batch.core.JobInterruptedException;
 import org.springframework.batch.core.StepContribution;
 import org.springframework.batch.core.StepExecution;
@@ -256,6 +257,12 @@ public RepeatStatus doInChunkContext(RepeatContext repeatContext, ChunkContext c
 
 				chunkListener.afterChunk(chunkContext);
 
+				final JobExecution jobExecution = stepExecution.getJobExecution();
+				if (jobExecution.isStopping()) {
+					logger.info("Parent JobExecution is stopped, so passing message on to StepExecution");
+					stepExecution.setTerminateOnly();
+				}
+
 				// Check for interruption after transaction as well, so that
 				// the interrupted exception is correctly propagated up to
 				// caller