From 75527483f897128080996d29a79ad1cece71d84d Mon Sep 17 00:00:00 2001 From: Mark Fisher Date: Sat, 16 Oct 2010 15:43:32 -0400 Subject: [PATCH] INT-1513 default send timeout for all handlers that extend AbstractReplyProducingMessageHandler is now that of the underlying MessagingTemplate (-1, indefinite). It can of course be changed via setSendTimeout(long). --- .../handler/AbstractReplyProducingMessageHandler.java | 4 ---- .../integration/config/xml/HeaderEnricherParserTests.java | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractReplyProducingMessageHandler.java b/spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractReplyProducingMessageHandler.java index 897fb27099..5f6cf856ca 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractReplyProducingMessageHandler.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractReplyProducingMessageHandler.java @@ -37,9 +37,6 @@ import org.springframework.util.Assert; */ public abstract class AbstractReplyProducingMessageHandler extends AbstractMessageHandler implements MessageProducer { - public static final long DEFAULT_SEND_TIMEOUT = 1000; - - private MessageChannel outputChannel; private volatile boolean requiresReply = false; @@ -49,7 +46,6 @@ public abstract class AbstractReplyProducingMessageHandler extends AbstractMessa public AbstractReplyProducingMessageHandler() { this.messagingTemplate = new MessagingTemplate(); - this.messagingTemplate.setSendTimeout(DEFAULT_SEND_TIMEOUT); } diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/HeaderEnricherParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/HeaderEnricherParserTests.java index df493799c8..5a7f529668 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/HeaderEnricherParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/HeaderEnricherParserTests.java @@ -43,7 +43,7 @@ public class HeaderEnricherParserTests { public void sendTimeoutDefault() { Object endpoint = context.getBean("headerEnricherWithDefaults"); long sendTimeout = TestUtils.getPropertyValue(endpoint, "handler.messagingTemplate.sendTimeout", Long.class).longValue(); - assertEquals(1000L, sendTimeout); + assertEquals(-1L, sendTimeout); } @Test // INT-1154