From ea19a7d5a2427c5d8f8ea0fe431c4c7aa808446d Mon Sep 17 00:00:00 2001
From: Mark Fisher <markfisher@vmware.com>
Date: Thu, 4 Aug 2011 23:14:11 -0400
Subject: [PATCH] INT-2034 clearing the replyTo address after it has been used
 (i.e. it is not copied along with the reply Message itself)

---
 .../integration/amqp/inbound/AmqpInboundGateway.java          | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/inbound/AmqpInboundGateway.java b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/inbound/AmqpInboundGateway.java
index 8ca8ae14e1..6f06dfd7fe 100644
--- a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/inbound/AmqpInboundGateway.java
+++ b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/inbound/AmqpInboundGateway.java
@@ -84,7 +84,9 @@ public class AmqpInboundGateway extends MessagingGatewaySupport {
 					amqpTemplate.convertAndSend(replyTo.getExchangeName(), replyTo.getRoutingKey(), reply.getPayload(),
 							new MessagePostProcessor() {
 								public Message postProcessMessage(Message message) throws AmqpException {
-									headerMapper.fromHeaders(reply.getHeaders(), message.getMessageProperties());									
+									headerMapper.fromHeaders(reply.getHeaders(), message.getMessageProperties());
+									// clear the replyTo from the original message since we are using it now
+									message.getMessageProperties().setReplyTo(null);
 									return message;
 								}
 							});