Upgrade STOPPING to STOPPED when updating JobExecution if it ends.

Author: lcmarvin

spring-batch-core/src/main/java/org/springframework/batch/core/repository/support/SimpleJobRepository.java

@@ -172,6 +172,12 @@ public void update(JobExecution jobExecution) {
 		jobExecution.setLastUpdated(new Date(System.currentTimeMillis()));
 
 		jobExecutionDao.synchronizeStatus(jobExecution);
+		if (jobExecution.getStatus() == BatchStatus.STOPPING && jobExecution.getEndTime() != null) {
+			if (logger.isInfoEnabled()) {
+				logger.info("Upgrade STOPPING to STOPPED since JobExecution has already ended.");
+			}
+			jobExecution.upgradeStatus(BatchStatus.STOPPED);
+		}
 		jobExecutionDao.updateJobExecution(jobExecution);
 	}
 

spring-batch-core/src/test/java/org/springframework/batch/core/repository/support/SimpleJobRepositoryTests.java

@@ -296,4 +296,14 @@ public void testGetStepExecutionCount() {
 		// Then
 		assertEquals(expectedResult, actualResult);
 	}
+
+	@Test
+	public void testUpgradeStopping() {
+		jobExecution.setStatus(BatchStatus.STOPPING);
+		jobExecution.setEndTime(new Date());
+
+		jobRepository.update(jobExecution);
+
+		assertEquals(BatchStatus.STOPPED, jobExecution.getStatus());
+	}
 }