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 
Added some logging and a test case
This commit is contained in:
dsyer
2009-06-04 09:37:12 +00:00
parent 001226ea1d
commit 7b054c0360
11 changed files with 59 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -110,8 +110,8 @@ public class RepeatTemplate implements RepeatOperations {
/**
* Setter for policy to decide when the batch is complete. The default is to
* complete normally when the callback returns a {@link RepeatStatus} which is
* not marked as continuable, and abnormally when the callback throws an
* complete normally when the callback returns a {@link RepeatStatus} which
* is not marked as continuable, and abnormally when the callback throws an
* exception (but the decision to re-throw the exception is deferred to the
* {@link ExceptionHandler}).
*
@@ -222,13 +222,15 @@ public class RepeatTemplate implements RepeatOperations {
for (int i = listeners.length; i-- > 0;) {
RepeatListener interceptor = listeners[i];
interceptor.onError(context, unwrappedThrowable);
// 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);
}
@@ -261,7 +263,10 @@ public class RepeatTemplate implements RepeatOperations {
try {
if (!throwables.isEmpty()) {
rethrow((Throwable) throwables.iterator().next());
Throwable throwable = (Throwable) throwables.iterator().next();
logger.debug("Handling fatal exception explicitly (rethrowing first of " + throwables.size()
+ "): " + throwable.getClass().getName() + ": " + throwable.getMessage());
rethrow(throwable);
}
}
@@ -358,8 +363,8 @@ public class RepeatTemplate implements RepeatOperations {
* processes. By default does nothing and returns true.
*
* @param state the internal state.
* @return true if {@link #canContinue(RepeatStatus)} is true for all results
* retrieved.
* @return true if {@link #canContinue(RepeatStatus)} is true for all
* results retrieved.
*/
protected boolean waitForResults(RepeatInternalState state) {
// no-op by default

2
spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/support/RetryTemplate.java
View File

@@ -195,6 +195,7 @@ public class RetryTemplate implements RetryOperations {
// Allow the retry policy to initialise itself...
RetryContext context = open(retryPolicy, state);
logger.debug("RetryContext retrieved: "+context);
// Make sure the context is available globally for clients who need
// it...
@@ -248,6 +249,7 @@ public class RetryTemplate implements RetryOperations {
throw ex;
}
logger.debug("Checking for rethrow: count=" + context.getRetryCount());
if (shouldRethrow(retryPolicy, context, state)) {
logger.debug("Rethrow in retry for policy: count=" + context.getRetryCount());
throw e;