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

Upgrade to Spring 2.5.5

Browse Source
This commit is contained in:
dsyer
2008-06-24 13:45:45 +00:00
parent 80b4386c1b
commit f7fb7e0228
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
spring-batch-integration/pom.xml
View File

@@ -12,7 +12,6 @@
<relativePath>..</relativePath>
</parent>
<properties>
<spring.framework.version>2.5.4.A</spring.framework.version>
<spring.integration.version>1.0.0.M4</spring.integration.version>
</properties>
<profiles>
@@ -84,31 +83,31 @@
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>org.springframework.context</artifactId>
<artifactId>spring-context</artifactId>
<version>${spring.framework.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>org.springframework.aop</artifactId>
<artifactId>spring-aop</artifactId>
<version>${spring.framework.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>org.springframework.jms</artifactId>
<artifactId>spring-jms</artifactId>
<version>${spring.framework.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>org.springframework.transaction</artifactId>
<artifactId>spring-tx</artifactId>
<version>${spring.framework.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>org.springframework.test</artifactId>
<artifactId>spring-test</artifactId>
<version>${spring.framework.version}</version>
<scope>test</scope>
</dependency>

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

@@ -153,10 +153,11 @@ public class ChunkMessageChannelItemWriter extends StepExecutionListenerSupport
private boolean waitForResults() {
// TODO: cumulative timeout, or throw an exception?
int count = 0;
while (localState.getExpecting() > 0 && count++ < 10) {
int maxCount = 10;
while (localState.getExpecting() > 0 && count++ < maxCount) {
getNextResult(100);
}
return count < 10;
return count < maxCount;
}
/**