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

Fixing some consistency issues in the behaviour of the Resequencer

Browse Source
This commit is contained in:
Marius Bogoevici
2009-03-13 06:51:35 +00:00
parent f0385a776f
commit 79b3ebb171
2 changed files with 48 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
org.springframework.integration/src/main/java/org/springframework/integration/aggregator/Resequencer.java
View File

@@ -85,6 +85,9 @@ public class Resequencer extends AbstractMessageBarrierHandler<SortedSet<Message
}
private boolean hasReceivedAllMessages(MessageBarrier<SortedSet<Message<?>>> barrier) {
if(barrier.getMessages().isEmpty()) {
return false;
}
int sequenceSize = barrier.getMessages().first().getHeaders().getSequenceSize();
int messagesCurrentlyInBarrier = barrier.getMessages().size();
int lastReleasedSequenceNumber = barrier.getAttribute(LAST_RELEASED_SEQUENCE_NUMBER);
@@ -126,13 +129,16 @@ public class Resequencer extends AbstractMessageBarrierHandler<SortedSet<Message
logger.debug("A message with the same sequence number has been already received: " + message);
return false;
}
// one can always add a message to the barrier if it's empty. Afterwards, assume that the complete sequence size
//
if (!barrier.getMessages().isEmpty() &&
barrier.getMessages().first().getHeaders().getSequenceSize() < message.getHeaders().getSequenceNumber()) {
if (message.getHeaders().getSequenceSize() < message.getHeaders().getSequenceNumber()) {
logger.debug("The message has a sequence number which is larger than the sequence size: "+ message);
return false;
}
if (!barrier.getMessages().isEmpty() &&
message.getHeaders().getSequenceSize() != barrier.getMessages().first().getHeaders().getSequenceSize()) {
logger.debug("The message has a sequence size which is different from other messages handled so far: " + message
+ ", expected value is " + barrier.getMessages().first().getHeaders().getSequenceNumber());
return false;
}
return true;
}