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

RESOLVED - BATCH-765: StepExecution should be saved on every commit

Browse Source
This commit is contained in:
robokaso
2008-08-11 13:31:33 +00:00
parent f49b5c5e15
commit f291ba3385
2 changed files with 33 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-batch-core/src/main/java/org/springframework/batch/core/step/item/ItemOrientedStep.java
View File

@@ -318,6 +318,8 @@ public class ItemOrientedStep extends AbstractStep {
logger.error("Fatal error detected during commit.");
throw new FatalException("Fatal error detected during commit", e);
}
getJobRepository().saveOrUpdate(stepExecution);
}
catch (Error e) {

33
spring-batch-core/src/test/java/org/springframework/batch/core/step/item/ItemOrientedStepTests.java
View File

@@ -684,8 +684,7 @@ public class ItemOrientedStepTests extends TestCase {
String msg = stepExecution.getExitStatus().getExitDescription();
assertEquals("", msg);
msg = ex.getMessage();
assertTrue("Message does not contain 'closing step': " + msg, contains(msg,
"closing step"));
assertTrue("Message does not contain 'closing step': " + msg, contains(msg, "closing step"));
// The original rollback was caused by this one:
assertEquals("Bar", ex.getCause().getMessage());
}
@@ -795,6 +794,36 @@ public class ItemOrientedStepTests extends TestCase {
}
public void testStepExecutionUpdates() throws Exception {
JobExecution jobExecution = new JobExecution(jobInstance);
StepExecution stepExecution = new StepExecution(itemOrientedStep.getName(), jobExecution);
itemOrientedStep.setStepOperations(new RepeatTemplate());
JobRepositoryStub jobRepository = new JobRepositoryStub();
itemOrientedStep.setJobRepository(jobRepository);
itemOrientedStep.execute(stepExecution);
assertEquals(3, processed.size());
assertEquals(3, stepExecution.getItemCount().intValue());
assertTrue(3 <= jobRepository.updateCount);
}
private static class JobRepositoryStub extends JobRepositorySupport {
private int updateCount = -1;
public void saveOrUpdate(StepExecution stepExecution) {
updateCount++;
if (updateCount <= 3) {
assertEquals(Integer.valueOf(updateCount), stepExecution.getItemCount());
}
}
}
private boolean contains(String str, String searchStr) {
return str.indexOf(searchStr) != -1;
}