From 8f89535329e1e70bc04de575c35df8d7f6b3ec74 Mon Sep 17 00:00:00 2001
From: Gary Russell <grussell@pivotal.io>
Date: Thu, 12 May 2016 16:45:44 -0400
Subject: [PATCH] INT-4030: Sporadic JMS Test Failures

JIRA https://jira.spring.io/browse/INT-4030

Backport a recent fix from master and increase diagnostics.
---
 .../integration/jms/JmsOutboundGatewayTests.java            | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/JmsOutboundGatewayTests.java b/spring-integration-jms/src/test/java/org/springframework/integration/jms/JmsOutboundGatewayTests.java
index 4488cd6a70..0eb54fa810 100644
--- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/JmsOutboundGatewayTests.java
+++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/JmsOutboundGatewayTests.java
@@ -73,6 +73,10 @@ public class JmsOutboundGatewayTests extends LogAdjustingTestSupport {
 
 	final Log logger = LogFactory.getLog(this.getClass());
 
+	public JmsOutboundGatewayTests() {
+		super("org.springframework.integration", "org.springframework.jms", "org.apache");
+	}
+
 	@Test
 	public void testContainerBeanNameWhenNoGatewayBeanName() {
 		JmsOutboundGateway gateway = new JmsOutboundGateway();
@@ -263,11 +267,13 @@ public class JmsOutboundGatewayTests extends LogAdjustingTestSupport {
 				return reply;
 			}
 		};
+		logger.debug("Sending reply to: " + replyQ);
 		template.send(replyQ, reply);
 		logger.debug("Sent reply to: " + replyQ);
 		org.springframework.messaging.Message<?> received = queueChannel.receive(20000);
 		assertNotNull(received);
 		assertEquals("bar", received.getPayload());
+		gateway.stop();
 		connectionFactory1.destroy();
 		connectionFactory2.destroy();
 	}