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

OPEN - BATCH-654: Transactions when commit fails

Browse Source 
reverted the previous solution, it wouldn't really help
This commit is contained in:
robokaso
2008-06-06 14:06:38 +00:00
parent 143b1e6be0
commit c2c33fc00b
2 changed files with 6 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -265,23 +265,18 @@ public class ItemOrientedStep extends AbstractStep {
throw new FatalException("Fatal error detected during save of step execution context", e);
}
itemHandler.mark();
try {
itemHandler.mark();
transactionManager.commit(transaction);
}
catch (Exception e) {
fatalException.setException(e);
stepExecution.setStatus(BatchStatus.UNKNOWN);
logger.error("Fatal error detected during commit.");
throw new CommitException("Fatal error detected during commit - "
+ "the execution is in undefined state and restart will not be possible", e);
throw new FatalException("Fatal error detected during commit", e);
}
}
catch (CommitException e) {
// trying to rollback after failed commit would just be
// asking for more trouble - die ASAP
throw e;
}
catch (Error e) {
processRollback(stepExecution, contribution, fatalException, transaction);
throw e;
@@ -387,15 +382,6 @@ public class ItemOrientedStep extends AbstractStep {
}
/**
* Encapsulates exception thrown while committing transaction.
*/
private static class CommitException extends FatalException {
public CommitException(String msg, Throwable cause) {
super(msg, cause);
}
}
protected void close(ExecutionContext ctx) throws Exception {
stream.close(ctx);
}

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

@@ -654,9 +654,9 @@ public class ItemOrientedStepTests extends TestCase {
catch (RuntimeException ex) {
assertEquals(BatchStatus.UNKNOWN, stepExecution.getStatus());
String msg = stepExecution.getExitStatus().getExitDescription();
assertTrue(msg.contains("Fatal error detected during commit - the execution is in undefined state and restart will not be possible"));
assertTrue(msg.contains("Fatal error detected during commit"));
msg = ex.getMessage();
assertTrue(msg.contains("Fatal error detected during commit - the execution is in undefined state and restart will not be possible"));
assertTrue(msg.contains("Fatal error detected during commit"));
// The original rollback was caused by this one:
assertEquals("Bar", ex.getCause().getMessage());
}