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 @@ - + 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());