From c7aa508434b49f9d320c6b137915083373f0e988 Mon Sep 17 00:00:00 2001
From: Gary Russell <grussell@pivotal.io>
Date: Thu, 8 Jun 2017 10:48:17 -0400
Subject: [PATCH] Fix JMS Outbound Gateway

45ae13809157f7d83e6a7f7516876d71b663e6cb caused the reply destination to overridden to "".
---
 .../integration/jms/JmsOutboundGateway.java        | 14 +++++---------
 .../request_reply/producer-cached-consumers.xml    |  2 ++
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsOutboundGateway.java b/spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsOutboundGateway.java
index f96f0cbf15..faaa5f6745 100644
--- a/spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsOutboundGateway.java
+++ b/spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsOutboundGateway.java
@@ -597,7 +597,7 @@ public class JmsOutboundGateway extends AbstractReplyProducingMessageHandler imp
 		if (this.replyDestination != null) {
 			container.setDestination(this.replyDestination);
 		}
-		if (StringUtils.hasText(this.replyDestinationName)) {
+		else if (StringUtils.hasText(this.replyDestinationName)) {
 			container.setDestinationName(this.replyDestinationName);
 		}
 		else {
@@ -1163,15 +1163,11 @@ public class JmsOutboundGateway extends AbstractReplyProducingMessageHandler imp
 		}
 		if (logger.isDebugEnabled()) {
 			if (reply == null) {
-				if (logger.isDebugEnabled()) {
-					logger.debug(this.getComponentName() + " Timed out waiting for reply with CorrelationId "
-							+ correlationId);
-				}
+				logger.debug(this.getComponentName() + " Timed out waiting for reply with CorrelationId "
+						+ correlationId);
 			}
 			else {
-				if (logger.isDebugEnabled()) {
-					logger.debug(this.getComponentName() + " Obtained reply with CorrelationId " + correlationId);
-				}
+				logger.debug(this.getComponentName() + " Obtained reply with CorrelationId " + correlationId);
 			}
 		}
 		return reply;
@@ -1372,7 +1368,7 @@ public class JmsOutboundGateway extends AbstractReplyProducingMessageHandler imp
 		}
 
 		public Destination getReplyDestination() {
-			Destination replyDest = this.getDestination();
+			Destination replyDest = getDestination();
 			if (replyDest == null) {
 				replyDest = this.replyDestination;
 			}
diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/producer-cached-consumers.xml b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/producer-cached-consumers.xml
index dccb86d310..84047847a5 100644
--- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/producer-cached-consumers.xml
+++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/producer-cached-consumers.xml
@@ -52,6 +52,7 @@
 
 	<int-jms:outbound-gateway request-channel="jmsInOptimizedC"
 		connection-factory="jmsConnectionFactory"
+		receive-timeout="10000"
 		request-destination="siOutQueueOptimizedC"
 		reply-destination="siInQueueOptimizedC"
 		correlation-key="JMSCorrelationID">
@@ -72,6 +73,7 @@
 
 	<int-jms:outbound-gateway request-channel="jmsInNonOptimizedD"
 		connection-factory="jmsConnectionFactory"
+		receive-timeout="10000"
 		request-destination="siOutQueueNonOptimizedD"
 		reply-destination="siInQueueNonOptimizedD">
 		<int-jms:reply-listener />