From f9b319d3ba9d3141fd5edc4fde558daebd2c596f Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Wed, 31 May 2017 12:30:11 -0400 Subject: [PATCH] Revert Incorrect MessagingTemplate Change The change to "optimize" the template by not rebuilding the reply message when the original header channels was null was incorrect. We need to null out those headers if they were originally null. Issue: SPR-15991 --- .../messaging/core/GenericMessagingTemplate.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-messaging/src/main/java/org/springframework/messaging/core/GenericMessagingTemplate.java b/spring-messaging/src/main/java/org/springframework/messaging/core/GenericMessagingTemplate.java index d8d4a9b0214..512e2a64a14 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/core/GenericMessagingTemplate.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/core/GenericMessagingTemplate.java @@ -230,7 +230,7 @@ public class GenericMessagingTemplate extends AbstractDestinationResolvingMessag } Message replyMessage = this.doReceive(tempReplyChannel, receiveTimeout); - if (replyMessage != null && (originalReplyChannelHeader!= null || originalErrorChannelHeader != null)) { + if (replyMessage != null) { replyMessage = MessageBuilder.fromMessage(replyMessage) .setHeader(MessageHeaders.REPLY_CHANNEL, originalReplyChannelHeader) .setHeader(MessageHeaders.ERROR_CHANNEL, originalErrorChannelHeader)