Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

INT-1364 AbstractMessagingGateway's default request and reply timeouts are now 1000 ms (were indefinite).

Browse Source
This commit is contained in:
Mark Fisher
2010-08-31 16:29:04 +00:00
parent 041ddbdf37
commit 93bc11fca7
5 changed files with 48 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
spring-integration-core/src/main/java/org/springframework/integration/gateway/AbstractMessagingGateway.java
View File

@@ -43,14 +43,17 @@ import org.springframework.util.Assert;
* @author Mark Fisher
*/
public abstract class AbstractMessagingGateway extends AbstractEndpoint {
private static final long DEFAULT_TIMEOUT = 1000L;
private volatile InboundMessageMapper<Throwable> exceptionMapper;
private volatile MessageChannel requestChannel;
private volatile MessageChannel replyChannel;
private volatile long replyTimeout = 1000;
private volatile long replyTimeout = DEFAULT_TIMEOUT;
private final MessagingTemplate messagingTemplate = new MessagingTemplate();
@@ -62,6 +65,12 @@ public abstract class AbstractMessagingGateway extends AbstractEndpoint {
private final Object replyMessageCorrelatorMonitor = new Object();
public AbstractMessagingGateway() {
this.messagingTemplate.setSendTimeout(DEFAULT_TIMEOUT);
this.messagingTemplate.setReceiveTimeout(this.replyTimeout);
}
@Override
public String getComponentType(){
return "gateway";
@@ -88,7 +97,7 @@ public abstract class AbstractMessagingGateway extends AbstractEndpoint {
/**
* Set the timeout value for sending request messages. If not
* explicitly configured, the default is an indefinite timeout.
* explicitly configured, the default is one second.
*
* @param requestTimeout the timeout value in milliseconds
*/
@@ -98,7 +107,7 @@ public abstract class AbstractMessagingGateway extends AbstractEndpoint {
/**
* Set the timeout value for receiving reply messages. If not
* explicitly configured, the default is an indefinite timeout.
* explicitly configured, the default is one second.
*
* @param replyTimeout the timeout value in milliseconds
*/

17
spring-integration-core/src/test/java/org/springframework/integration/gateway/SimpleMessagingGatewayTests.java
View File

@@ -17,6 +17,7 @@
package org.springframework.integration.gateway;
import static org.easymock.EasyMock.createMock;
import static org.easymock.EasyMock.eq;
import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.getCurrentArguments;
import static org.easymock.EasyMock.isA;
@@ -73,7 +74,7 @@ public class SimpleMessagingGatewayTests {
@Test
public void sendMessage() {
expect(requestChannel.send(messageMock)).andReturn(true);
expect(requestChannel.send(messageMock, 1000L)).andReturn(true);
replay(allmocks);
this.simpleMessagingGateway.send(messageMock);
verify(allmocks);
@@ -82,7 +83,7 @@ public class SimpleMessagingGatewayTests {
@Test(expected=MessageDeliveryException.class)
public void sendMessage_failure() {
expect(messageMock.getHeaders()).andReturn(new MessageHeaders(null));
expect(requestChannel.send(messageMock)).andReturn(false);
expect(requestChannel.send(messageMock, 1000)).andReturn(false);
replay(allmocks);
this.simpleMessagingGateway.send(messageMock);
verify(allmocks);
@@ -90,7 +91,7 @@ public class SimpleMessagingGatewayTests {
@Test
public void sendObject() {
expect(requestChannel.send(isA(Message.class))).andAnswer(new IAnswer<Boolean>() {
expect(requestChannel.send(isA(Message.class), eq(1000L))).andAnswer(new IAnswer<Boolean>() {
public Boolean answer() throws Throwable {
assertEquals("test", ((Message) getCurrentArguments()[0]).getPayload());
return true;
@@ -103,7 +104,7 @@ public class SimpleMessagingGatewayTests {
@Test(expected=MessageDeliveryException.class)
public void sendObject_failure() {
expect(requestChannel.send(isA(Message.class))).andAnswer(new IAnswer<Boolean>() {
expect(requestChannel.send(isA(Message.class), eq(1000L))).andAnswer(new IAnswer<Boolean>() {
public Boolean answer() throws Throwable {
assertEquals("test", ((Message) getCurrentArguments()[0]).getPayload());
return false;
@@ -129,7 +130,7 @@ public class SimpleMessagingGatewayTests {
@Test
public void receiveMessage() {
expect(replyChannel.receive()).andReturn(messageMock);
expect(replyChannel.receive(1000)).andReturn(messageMock);
expect(messageMock.getPayload()).andReturn("test").anyTimes();
replay(allmocks);
assertEquals("test", this.simpleMessagingGateway.receive());
@@ -138,7 +139,7 @@ public class SimpleMessagingGatewayTests {
@Test
public void receiveMessage_null() {
expect(replyChannel.receive()).andReturn(null);
expect(replyChannel.receive(1000)).andReturn(null);
replay(allmocks);
assertNull(this.simpleMessagingGateway.receive());
verify(allmocks);
@@ -149,7 +150,7 @@ public class SimpleMessagingGatewayTests {
@Test
public void sendObjectAndReceiveObject() {
expect(replyChannel.receive(100)).andReturn(messageMock);
expect(requestChannel.send(isA(Message.class))).andReturn(true);
expect(requestChannel.send(isA(Message.class), eq(1000L))).andReturn(true);
replay(allmocks);
// TODO: if timeout is 0, this will fail occasionally
this.simpleMessagingGateway.setReplyTimeout(100);
@@ -191,7 +192,7 @@ public class SimpleMessagingGatewayTests {
@Test
public void sendObjectAndReceiveMessage() {
expect(replyChannel.receive(100)).andReturn(messageMock);
expect(requestChannel.send(isA(Message.class))).andReturn(true);
expect(requestChannel.send(isA(Message.class), eq(1000L))).andReturn(true);
replay(allmocks);
// TODO: commenting the next line causes the test to hang
this.simpleMessagingGateway.setReplyTimeout(100);