Spring/spring-batch
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

BATCH-1360: Returning null from Tasklet.execute() is treated as RepeatStatus.FINISHED.

Browse Source
This commit is contained in:
dhgarrette
2009-08-08 03:04:07 +00:00
parent 3a0e967c21
commit d2f4849598
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -266,7 +266,9 @@ public class TaskletStep extends AbstractStep {
try {
try {
result = tasklet.execute(contribution, chunkContext);
Assert.state(result != null, "Tasklet execution must return a non-null RepeatStatus.");
if(result == null) {
result = RepeatStatus.FINISHED;
}
}
catch (Exception e) {
if (transactionAttribute.rollbackOn(e)) {

8
spring-batch-core/src/test/java/org/springframework/batch/core/step/tasklet/TaskletStepTests.java
View File

@@ -26,6 +26,7 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import org.apache.commons.lang.mutable.MutableInt;
import org.junit.Before;
import org.junit.Test;
import org.springframework.batch.core.BatchStatus;
@@ -853,12 +854,7 @@ public class TaskletStepTests {
JobExecution jobExecutionContext = new JobExecution(jobInstance);
StepExecution stepExecution = new StepExecution(step.getName(), jobExecutionContext);
step.execute(stepExecution);
assertEquals(BatchStatus.FAILED, stepExecution.getStatus());
List<Throwable> exceptions = stepExecution.getFailureExceptions();
assertEquals(1, exceptions.size());
Throwable exception = exceptions.get(0);
assertTrue(exception instanceof IllegalStateException);
assertEquals("Tasklet execution must return a non-null RepeatStatus.", exception.getMessage());
assertEquals(BatchStatus.COMPLETED, stepExecution.getStatus());
}
private static class JobRepositoryStub extends JobRepositorySupport {