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

OPEN - issue BATCH-1272: Write skips do not work in a multi-threaded step

Browse Source 
RESOLVED - BATCH-1278: RepeatTemplate aborts early
This commit is contained in:
dsyer
2009-06-04 10:43:57 +00:00
parent 7b054c0360
commit 58819c9d7e
5 changed files with 135 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/support/RepeatTemplate.java
View File

@@ -183,7 +183,10 @@ public class RepeatTemplate implements RepeatOperations {
RepeatStatus result = RepeatStatus.CONTINUABLE;
RepeatInternalState state = createInternalState(context);
// This is the list of exceptions thrown by all active callbacks
Collection<Throwable> throwables = state.getThrowables();
// Keep a separate list of exceptions we handled that need to be rethrown
Collection<Throwable> deferred = new ArrayList<Throwable>();
try {
@@ -214,33 +217,11 @@ public class RepeatTemplate implements RepeatOperations {
}
catch (Throwable throwable) {
// An exception alone is not sufficient grounds for not
// continuing
Throwable unwrappedThrowable = unwrapIfRethrown(throwable);
try {
for (int i = listeners.length; i-- > 0;) {
RepeatListener interceptor = listeners[i];
// This is not an error - only log at debug
// level.
logger.debug("Exception intercepted (" + (i + 1) + " of " + listeners.length + ")",
unwrappedThrowable);
interceptor.onError(context, unwrappedThrowable);
}
logger.debug("Handling exception: " + throwable.getClass().getName() + ", caused by: "
+ unwrappedThrowable.getClass().getName() + ": " + unwrappedThrowable.getMessage());
exceptionHandler.handleException(context, unwrappedThrowable);
}
catch (Throwable handled) {
throwables.add(handled);
}
doHandle(throwable, context, deferred);
}
// N.B. the order may be important here:
if (isComplete(context, result) || isMarkedComplete(context) || !throwables.isEmpty()) {
if (isComplete(context, result) || isMarkedComplete(context) || !deferred.isEmpty()) {
running = false;
}
}
@@ -248,6 +229,9 @@ public class RepeatTemplate implements RepeatOperations {
}
result = result.and(waitForResults(state));
for (Throwable throwable : throwables) {
doHandle(throwable, context, deferred);
}
// Explicitly drop any references to internal state...
state = null;
@@ -262,9 +246,9 @@ public class RepeatTemplate implements RepeatOperations {
try {
if (!throwables.isEmpty()) {
Throwable throwable = (Throwable) throwables.iterator().next();
logger.debug("Handling fatal exception explicitly (rethrowing first of " + throwables.size()
if (!deferred.isEmpty()) {
Throwable throwable = (Throwable) deferred.iterator().next();
logger.debug("Handling fatal exception explicitly (rethrowing first of " + deferred.size()
+ "): " + throwable.getClass().getName() + ": " + throwable.getMessage());
rethrow(throwable);
}
@@ -291,6 +275,32 @@ public class RepeatTemplate implements RepeatOperations {
}
private void doHandle(Throwable throwable, RepeatContext context,
Collection<Throwable> deferred) {
// An exception alone is not sufficient grounds for not
// continuing
Throwable unwrappedThrowable = unwrapIfRethrown(throwable);
try {
for (int i = listeners.length; i-- > 0;) {
RepeatListener interceptor = listeners[i];
// This is not an error - only log at debug
// level.
logger.debug("Exception intercepted (" + (i + 1) + " of " + listeners.length + ")",
unwrappedThrowable);
interceptor.onError(context, unwrappedThrowable);
}
logger.debug("Handling exception: " + throwable.getClass().getName() + ", caused by: "
+ unwrappedThrowable.getClass().getName() + ": " + unwrappedThrowable.getMessage());
exceptionHandler.handleException(context, unwrappedThrowable);
}
catch (Throwable handled) {
deferred.add(handled);
}
}
/**
* Re-throws the original throwable if it is unchecked, wraps checked
* exceptions into {@link RepeatException}.

2
spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/support/TaskExecutorRepeatTemplate.java
View File

@@ -120,7 +120,7 @@ public class TaskExecutorRepeatTemplate extends RepeatTemplate {
/*
* N.B. If the queue is empty then take() blocks until a result appears,
* and there must be at least one because we just submitted one to teh
* and there must be at least one because we just submitted one to the
* task executor.
*/
ResultHolder result = queue.take();