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

INT-379 - if a message is already having a correlation id, the messages created through splitting will bear that particular correlation id

Browse Source
This commit is contained in:
Marius Bogoevici
2009-02-01 16:48:49 +00:00
parent ddb6dece6e
commit fb1e68cd4f
2 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
org.springframework.integration/src/main/java/org/springframework/integration/splitter/AbstractMessageSplitter.java
View File

@@ -35,7 +35,8 @@ public abstract class AbstractMessageSplitter extends AbstractReplyProducingMess
if (result == null) {
return;
}
Object correlationId = message.getHeaders().getId();
Object correlationId = (message.getHeaders().getCorrelationId() != null) ?
message.getHeaders().getCorrelationId(): message.getHeaders().getId();
if (result instanceof Collection) {
Collection<?> items = (Collection<?>) result;
int sequenceNumber = 0;

17
org.springframework.integration/src/test/java/org/springframework/integration/endpoint/CorrelationIdTests.java
View File

@@ -98,7 +98,7 @@ public class CorrelationIdTests {
}
@Test
public void testCorrelationIdWithSplitter() throws Exception {
public void testCorrelationIdWithSplitterWhenNotValueSetOnIncomingMessage() throws Exception {
Message<?> message = new StringMessage("test1,test2");
QueueChannel testChannel = new QueueChannel();
MethodInvokingSplitter splitter = new MethodInvokingSplitter(
@@ -111,6 +111,21 @@ public class CorrelationIdTests {
assertEquals(message.getHeaders().getId(), reply2.getHeaders().getCorrelationId());
}
@Test
public void testCorrelationIdWithSplitterWhenValueSetOnIncomingMessage() throws Exception {
final String correlationIdForTest = "#FOR_TEST#";
Message<?> message = MessageBuilder.withPayload("test1,test2").setCorrelationId(correlationIdForTest).build();
QueueChannel testChannel = new QueueChannel();
MethodInvokingSplitter splitter = new MethodInvokingSplitter(
new TestBean(), TestBean.class.getMethod("split", String.class));
splitter.setOutputChannel(testChannel);
splitter.handleMessage(message);
Message<?> reply1 = testChannel.receive(100);
Message<?> reply2 = testChannel.receive(100);
assertEquals(correlationIdForTest, reply1.getHeaders().getCorrelationId());
assertEquals(correlationIdForTest, reply2.getHeaders().getCorrelationId());
}
private static class TestBean {