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

INT-928: tidy nested aggregator

Browse Source
This commit is contained in:
David Syer
2010-08-04 20:15:41 +00:00
parent 8893388a8d
commit 43c2849248
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
spring-integration-core/src/main/java/org/springframework/integration/aggregator/AbstractAggregatingMessageGroupProcessor.java
View File

@@ -81,7 +81,8 @@ public abstract class AbstractAggregatingMessageGroupProcessor implements Messag
|| MessageHeaders.CORRELATION_ID.equals(key)) {
continue;
}
if (AbstractMessageSplitter.SEQUENCE_DETAILS.equals(key) && !aggregatedHeaders.containsKey(MessageHeaders.CORRELATION_ID)) {
if (AbstractMessageSplitter.SEQUENCE_DETAILS.equals(key)
&& !aggregatedHeaders.containsKey(MessageHeaders.CORRELATION_ID)) {
@SuppressWarnings("unchecked")
List<Object[]> incomingSequenceDetails = new ArrayList<Object[]>(currentHeaders
.get(key, List.class));
@@ -89,12 +90,15 @@ public abstract class AbstractAggregatingMessageGroupProcessor implements Messag
Assert.state(sequenceDetails.length == 3, "Wrong sequence details (not created by splitter?): "
+ Arrays.asList(sequenceDetails));
aggregatedHeaders.put(MessageHeaders.CORRELATION_ID, sequenceDetails[0]);
aggregatedHeaders.put(MessageHeaders.SEQUENCE_NUMBER, sequenceDetails[1]);
aggregatedHeaders.put(MessageHeaders.SEQUENCE_SIZE, sequenceDetails[2]);
Integer sequenceNumber = (Integer) sequenceDetails[1];
Integer sequenceSize = (Integer) sequenceDetails[2];
if (sequenceSize > 0) {
aggregatedHeaders.put(MessageHeaders.SEQUENCE_NUMBER, sequenceNumber);
aggregatedHeaders.put(MessageHeaders.SEQUENCE_SIZE, sequenceSize);
}
if (!incomingSequenceDetails.isEmpty()) {
aggregatedHeaders.put(AbstractMessageSplitter.SEQUENCE_DETAILS, incomingSequenceDetails);
}
System.err.println(aggregatedHeaders);
continue;
}
Object value = currentHeaders.get(key);