From dfade35f7a7a7d120d72949adc342967b706582c Mon Sep 17 00:00:00 2001
From: Mark Fisher <markfisher@vmware.com>
Date: Fri, 27 Feb 2009 15:05:54 +0000
Subject: [PATCH] Throwing a MessageTimeoutException if the request/reply
 Message handling times out.

---
 .../integration/http/HttpInboundEndpoint.java                | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/org.springframework.integration.http/src/main/java/org/springframework/integration/http/HttpInboundEndpoint.java b/org.springframework.integration.http/src/main/java/org/springframework/integration/http/HttpInboundEndpoint.java
index 7a0b03c696..987d663343 100644
--- a/org.springframework.integration.http/src/main/java/org/springframework/integration/http/HttpInboundEndpoint.java
+++ b/org.springframework.integration.http/src/main/java/org/springframework/integration/http/HttpInboundEndpoint.java
@@ -36,6 +36,7 @@ import javax.servlet.http.HttpServletResponse;
 import org.springframework.integration.core.Message;
 import org.springframework.integration.gateway.SimpleMessagingGateway;
 import org.springframework.integration.message.MessageBuilder;
+import org.springframework.integration.message.MessageTimeoutException;
 import org.springframework.web.HttpRequestHandler;
 import org.springframework.web.servlet.View;
 
@@ -304,6 +305,10 @@ public class HttpInboundEndpoint extends SimpleMessagingGateway implements HttpR
 			else {
 				reply = this.sendAndReceiveMessage(requestMessage);
 			}
+			if (reply == null) {
+				throw new MessageTimeoutException(requestMessage,
+						"failed to handle Message within specified timeout value");
+			}
 		}
 		else {
 			this.send(requestMessage);