Issue 375: RpcClient potential memory leak fix.

(cherry picked from commit d3ff8ef)

Author: John Lilley

src/main/java/com/rabbitmq/client/RpcClient.java

@@ -191,10 +191,11 @@ public void handleDelivery(String consumerTag,
                 synchronized (_continuationMap) {
                     String replyId = properties.getCorrelationId();
                     BlockingCell<Object> blocker =_continuationMap.remove(replyId);
-                    if (blocker == null) {
-                        throw new IllegalStateException("No outstanding request for correlation ID " + replyId);
-                    }
-                    blocker.set(new Response(consumerTag, envelope, properties, body));
+                    if (blocker != null) {
+	                    blocker.set(new Response(consumerTag, envelope, properties, body));
+                    } else {
+						// Not an error. Entry will have been removed if request timed out.
+					}
                 }
             }
         };
@@ -217,15 +218,23 @@ public Response doCall(AMQP.BasicProperties props, byte[] message, int timeout)
         throws IOException, ShutdownSignalException, TimeoutException {
         checkConsumer();
         BlockingCell<Object> k = new BlockingCell<Object>();
+		String replyId;
         synchronized (_continuationMap) {
             _correlationId++;
-            String replyId = "" + _correlationId;
+            replyId = "" + _correlationId;
             props = ((props==null) ? new AMQP.BasicProperties.Builder() : props.builder())
                 .correlationId(replyId).replyTo(_replyTo).build();
             _continuationMap.put(replyId, k);
         }
         publish(props, message);
-        Object reply = k.uninterruptibleGet(timeout);
+		Object reply;
+        try {
+			reply = k.uninterruptibleGet(timeout);
+		} catch (TimeoutException ex) {
+			// Avoid potential leak.  This entry is no longer needed by caller.
+			_continuationMap.remove(replyId);
+			throw ex;
+		}
         if (reply instanceof ShutdownSignalException) {
             ShutdownSignalException sig = (ShutdownSignalException) reply;
             ShutdownSignalException wrapper =