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

RESOLVED - issue BATCH-654: Transactions when commit fails

Browse Source
This commit is contained in:
dsyer
2008-06-18 10:24:18 +00:00
parent 26d14d2068
commit 345e7a4b81
8 changed files with 186 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -250,7 +250,7 @@ public class SimpleJobRepository implements JobRepository {
* @see org.springframework.batch.core.repository.JobRepository#saveOrUpdateExecutionContext(org.springframework.batch.core.domain.StepExecution)
*/
public void saveOrUpdateExecutionContext(StepExecution stepExecution) {
saveOrUpdate(stepExecution);
// Until there is an interface change (
stepExecutionDao.saveOrUpdateExecutionContext(stepExecution);
jobExecutionDao.saveOrUpdateExecutionContext(stepExecution.getJobExecution());
}

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

@@ -171,6 +171,7 @@ public abstract class AbstractStep implements Step, InitializingBean, BeanNameAw
exitStatus = exitStatus.and(getCompositeListener().afterStep(stepExecution));
try {
getJobRepository().saveOrUpdate(stepExecution);
getJobRepository().saveOrUpdateExecutionContext(stepExecution);
}
catch (Exception e) {

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

@@ -211,6 +211,7 @@ public class ItemOrientedStep extends AbstractStep {
*/
protected ExitStatus doExecute(final StepExecution stepExecution) throws Exception {
stream.update(stepExecution.getExecutionContext());
getJobRepository().saveOrUpdate(stepExecution);
getJobRepository().saveOrUpdateExecutionContext(stepExecution);
itemHandler.mark();
@@ -362,6 +363,12 @@ public class ItemOrientedStep extends AbstractStep {
throw new FatalException("Failed while processing rollback", e);
}
}
if (fatalException.hasException()) {
// Try and give the system a chance to update the stepExecution with
// the failure status.
getJobRepository().saveOrUpdate(stepExecution);
}
}
private static class ExceptionHolder {