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

IN PROGRESS - BATCH-805: Check noRollbackFor semantics in item/chunk oriented tasklets

Browse Source 
added logging for swallowed exceptions, removed non-rollback considerations for ItemStream.update call
This commit is contained in:
robokaso
2008-09-09 11:41:25 +00:00
parent d272105479
commit 72f49d7828
1 changed files with 12 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -206,9 +206,9 @@ public class TaskletStep extends AbstractStep {
* Process the step and update its context so that progress can be monitored
* by the caller. The step is broken down into chunks, each one executing in
* a transaction. The step and its execution and execution context are all
* given an up to date {@link BatchStatus}, and the {@link JobRepository}
* is used to store the result. Various reporting information are also added
* to the current context (the {@link RepeatContext} governing the step
* given an up to date {@link BatchStatus}, and the {@link JobRepository} is
* used to store the result. Various reporting information are also added to
* the current context (the {@link RepeatContext} governing the step
* execution, which would normally be available to the caller somehow
* through the step's {@link ExecutionContext}.<br/>
*
@@ -255,11 +255,17 @@ public class TaskletStep extends AbstractStep {
if (transactionAttribute.rollbackOn(e)) {
throw e;
}
else {
logger.error("Ecountered error that should not cause rollback: ", e);
}
}
catch (Exception e) {
if (transactionAttribute.rollbackOn(e)) {
throw e;
}
else {
logger.error("Ecountered error that should not cause rollback: ", e);
}
}
finally {
// Still some stuff to do with the data in this chunk,
@@ -289,19 +295,7 @@ public class TaskletStep extends AbstractStep {
Thread.currentThread().interrupt();
}
try {
stream.update(stepExecution.getExecutionContext());
}
catch (Error e) {
if (transactionAttribute.rollbackOn(e)) {
throw e;
}
}
catch (Exception e) {
if (transactionAttribute.rollbackOn(e)) {
throw e;
}
}
stream.update(stepExecution.getExecutionContext());
try {
getJobRepository().updateExecutionContext(stepExecution);
@@ -380,8 +374,8 @@ public class TaskletStep extends AbstractStep {
}
catch (Exception e) {
/*
* If we already failed to commit, it doesn't help to do this again -
* it's better to allow the CommitFailedException to propagate
* If we already failed to commit, it doesn't help to do this again
* - it's better to allow the CommitFailedException to propagate
*/
if (!fatalException.hasException()) {
fatalException.setException(e);