Fix for: https://issues.apache.org/activemq/browse/AMQNET-278

src/main/csharp/RequestTimedOutException.cs

@@ -0,0 +1,47 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using System;
+using System.Text;
+
+using Apache.NMS;
+
+namespace Apache.NMS.Stomp
+{
+    /// <summary>
+    /// Exception thrown when an Request times out.
+    /// </summary>
+    public class RequestTimedOutException : IOException
+    {
+        public RequestTimedOutException()
+            : base("IO Exception failed with missing exception log")
+        {
+        }
+
+        public RequestTimedOutException(String msg)
+            : base(msg)
+        {
+        }
+
+        public RequestTimedOutException(String msg, Exception inner)
+            : base(msg, inner)
+        {
+        }
+    }
+}
+
+

src/main/csharp/Transport/FutureResponse.cs

@@ -23,67 +23,72 @@
 
 namespace Apache.NMS.Stomp.Transport
 {
-	/// <summary>
-	/// Handles asynchronous responses
-	/// </summary>
-	public class FutureResponse
-	{
-		private TimeSpan maxWait = TimeSpan.FromMilliseconds(Timeout.Infinite);
-		public TimeSpan ResponseTimeout
-		{
-			get { return maxWait; }
-			set { maxWait = value; }
-		}
+    /// <summary>
+    /// Handles asynchronous responses
+    /// </summary>
+    public class FutureResponse
+    {
+        private TimeSpan maxWait = TimeSpan.FromMilliseconds(Timeout.Infinite);
+        public TimeSpan ResponseTimeout
+        {
+            get { return maxWait; }
+            set { maxWait = value; }
+        }
 
-		private readonly CountDownLatch latch = new CountDownLatch(1);
-		private Response response;
+        private readonly CountDownLatch latch = new CountDownLatch(1);
+        private Response response;
 
-		public WaitHandle AsyncWaitHandle
-		{
-			get { return latch.AsyncWaitHandle; }
-		}
+        public WaitHandle AsyncWaitHandle
+        {
+            get { return latch.AsyncWaitHandle; }
+        }
 
-		public Response Response
-		{
-			// Blocks the caller until a value has been set
-			get
-			{
-				lock(latch)
-				{
-					if(null != response)
-					{
-						return response;
-					}
-				}
+        public Response Response
+        {
+            // Blocks the caller until a value has been set
+            get
+            {
+                lock(latch)
+                {
+                    if(null != response)
+                    {
+                        return response;
+                    }
+                }
 
-				try
-				{
-					if(!latch.await(maxWait))
-					{
-						// TODO: Throw timeout exception?
-					}
-				}
-				catch (Exception e)
-				{
-					Tracer.Error("Caught while waiting on monitor: " + e);
-				}
+                try
+                {
+                    if(!latch.await(maxWait) && response == null)
+                    {
+                        throw new RequestTimedOutException();
+                    }
+                }
+                catch(RequestTimedOutException e)
+                {
+                    Tracer.Error("Caught Timeout Exception while waiting on monitor: " + e);
+                    throw;
+                }
+                catch(Exception e)
+                {
+                    Tracer.Error("Caught Exception while waiting on monitor: " + e);
+                }
 
-				lock(latch)
-				{
-					return response;
-				}
-			}
+                lock(latch)
+                {
+                    return response;
+                }
+            }
 
-			set
-			{
-				lock(latch)
-				{
-					response = value;
-				}
+            set
+            {
+                lock(latch)
+                {
+                    response = value;
+                }
 
-				latch.countDown();
-			}
-		}
-	}
+                latch.countDown();
+            }
+        }
+    }
 }