From 1fe50138f01d9e73ce79ec0a0c933c1ce945e746 Mon Sep 17 00:00:00 2001
From: Gary Russell <grussell@pivotal.io>
Date: Mon, 16 Nov 2015 16:45:28 -0500
Subject: [PATCH] Fix JMX MonitorTests

MessagingTemplate had no timeout and could hang the build.

OnlyOneTrigger could fire before the message is sent; increase
the poller receive timeout so the poller thread blocks until the message is sent.
---
 .../integration/monitor/MonitorTests-context.xml              | 2 +-
 .../org/springframework/integration/monitor/MonitorTests.java | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/MonitorTests-context.xml b/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/MonitorTests-context.xml
index 577c7ac06a..8e2c206398 100644
--- a/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/MonitorTests-context.xml
+++ b/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/MonitorTests-context.xml
@@ -20,7 +20,7 @@
 	<bean id="testTrigger" class="org.springframework.integration.test.util.OnlyOnceTrigger"/>
 
 	<int:bridge input-channel="input" output-channel="next">
-		<int:poller trigger="testTrigger" />
+		<int:poller trigger="testTrigger" receive-timeout="10000" />
 	</int:bridge>
 
 	<int:service-activator input-channel="next">
diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/MonitorTests.java b/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/MonitorTests.java
index 8aca18bc13..9fc0d5327d 100644
--- a/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/MonitorTests.java
+++ b/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/MonitorTests.java
@@ -104,7 +104,9 @@ public class MonitorTests {
 
 		new DirectFieldAccessor(this.handler).setPropertyValue("handlerMetrics", handlerMetrics);
 
-		Integer active = new MessagingTemplate(this.input).convertSendAndReceive("foo", Integer.class);
+		MessagingTemplate messagingTemplate = new MessagingTemplate(this.input);
+		messagingTemplate.setReceiveTimeout(10000);
+		Integer active = messagingTemplate.convertSendAndReceive("foo", Integer.class);
 		assertEquals(1, active.intValue());
 		assertTrue(afterHandleLatch.await(10, TimeUnit.SECONDS));
 		assertEquals(0, this.handler.getActiveCount());