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

BATCH-1360: Throw helpful error from if Tasklet.execute() returns null

Browse Source
This commit is contained in:
dhgarrette
2009-08-06 05:20:02 +00:00
parent 9d694b7d6c
commit 2d6a9de873
2 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@@ -843,6 +843,24 @@ public class TaskletStepTests {
}
@Test
public void testTaskletExecuteReturnNull() throws Exception {
step.setTasklet(new Tasklet() {
public RepeatStatus execute(StepContribution contribution, ChunkContext chunkContext) throws Exception {
return null;
}
});
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());
}
private static class JobRepositoryStub extends JobRepositorySupport {
private int updateCount = 0;