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

INT-CR-2 minor edits based on review feedback

Browse Source
This commit is contained in:
Mark Fisher
2009-12-10 00:34:55 +00:00
parent 538b13b757
commit 3ccd359b65
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
org.springframework.integration/src/main/java/org/springframework/integration/handler/AbstractReplyProducingMessageHandler.java
View File

@@ -139,9 +139,16 @@ public abstract class AbstractReplyProducingMessageHandler extends AbstractMessa
@SuppressWarnings("unchecked")
private Message<?> createReplyMessage(Object reply, MessageHeaders requestHeaders) {
MessageBuilder<?> builder = (reply instanceof MessageBuilder) ? (MessageBuilder) reply
: (reply instanceof Message) ? MessageBuilder.fromMessage((Message) reply)
: MessageBuilder.withPayload(reply);
MessageBuilder<?> builder = null;
if (reply instanceof MessageBuilder) {
builder = (MessageBuilder<?>) reply;
}
else if (reply instanceof Message) {
builder = MessageBuilder.fromMessage((Message) reply);
}
else {
builder = MessageBuilder.withPayload(reply);
}
builder.copyHeadersIfAbsent(requestHeaders);
return builder.build();
}

4
org.springframework.integration/src/test/java/org/springframework/integration/handler/CollectionAndArrayTests.java
View File

@@ -19,7 +19,9 @@ package org.springframework.integration.handler;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
import static org.hamcrest.CoreMatchers.is;
import java.util.Arrays;
import java.util.HashSet;
@@ -74,7 +76,7 @@ public class CollectionAndArrayTests {
Message<?> reply2 = channel.receive(0);
assertNotNull(reply1);
assertNull(reply2);
assertTrue(Set.class.isAssignableFrom(reply1.getPayload().getClass()));
assertThat(reply1.getPayload(), is(Set.class));
assertEquals(2, ((Set<?>) reply1.getPayload()).size());
}