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

BATCHADM-58: updgrade to Spring 3.0.4 to solve thread scope problem

Browse Source
This commit is contained in:
David Syer
2010-08-20 11:14:07 +00:00
committed by Michael Minella
parent 53f1023284
commit 95ab089713
5 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/ChunkMessageChannelItemWriter.java
View File

@@ -133,13 +133,22 @@ public class ChunkMessageChannelItemWriter<T> extends StepExecutionListenerSuppo
return ExitStatus.FAILED.addExitDescription(e.getClass().getName() + ": " + e.getMessage());
}
finally {
if (logger.isDebugEnabled()) {
logger.debug("Finished waiting for results in step listener. Still expecting: " + localState.getExpecting());
}
for (StepContribution contribution : getStepContributions()) {
if (logger.isDebugEnabled()) {
logger.debug("Applying:" + contribution);
}
stepExecution.apply(contribution);
}
}
if (timedOut) {
stepExecution.setStatus(BatchStatus.FAILED);
throw new ItemStreamException("Timed out waiting for back log at end of step");
return ExitStatus.FAILED.addExitDescription("Timed out waiting for " + localState.getExpecting()
+ " backlog at end of step");
}
return ExitStatus.COMPLETED.addExitDescription("Waited for " + expecting + " results.");
}

2
spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/MessageSourcePollerInterceptor.java
View File

@@ -42,7 +42,7 @@ public class MessageSourcePollerInterceptor extends ChannelInterceptorAdapter im
}
/**
* Optional MessageChannel for injecting the message receieved from the source (defaults to the channel intercepted
* Optional MessageChannel for injecting the message received from the source (defaults to the channel intercepted
* in {@link #preReceive(MessageChannel)}).
*
* @param channel the channel to set

2
spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/RemoteChunkHandlerFactoryBean.java
View File

@@ -180,7 +180,7 @@ public class RemoteChunkHandlerFactoryBean<T> implements FactoryBean<ChunkHandle
}
/**
* Update a StepContribution with all the data from a StepContributionSource. The filter and write conuts plus the
* Update a StepContribution with all the data from a StepContributionSource. The filter and write counts plus the
* exit status will be updated to reflect the data in the source.
*
* @param contribution the current contribution