merge bug18624 into default

Author: Matthias Radestock

src/com/rabbitmq/client/impl/AMQChannel.java

@@ -208,8 +208,7 @@ public synchronized void rpc(Method m, RpcContinuation k)
      * Not for regular use. Doesn't do the ensureIsOpen() check.
      */
     public AMQCommand quiescingRpc(Method m,
-                                   int timeoutMillisec,
-                                   final AMQCommand timeoutReply)
+                                   int timeoutMillisec)
         throws IOException, ShutdownSignalException, TimeoutException
     {
         SimpleBlockingRpcContinuation k = new SimpleBlockingRpcContinuation();

src/com/rabbitmq/client/impl/AMQConnection.java

@@ -661,7 +661,6 @@ public void close(int closeCode,
         throws IOException
     {
         close(closeCode, closeMessage, initiatedByApplication, cause, 0, false);
-
     }
 
     /**
@@ -679,11 +678,10 @@ public void close(int closeCode,
             AMQImpl.Connection.Close reason =
                 new AMQImpl.Connection.Close(closeCode, closeMessage, 0, 0);
             shutdown(reason, initiatedByApplication, cause);
-            _channel0.quiescingRpc(reason,
-                                   timeout,
-                                   new AMQCommand(new AMQImpl.Connection.CloseOk()));
-        } catch (TimeoutException ise) {
-            // FIXME: notify about timeout exception ?
+            _channel0.quiescingRpc(reason, timeout);
+        } catch (TimeoutException tte) {
+            if (!abort)
+                throw new ShutdownSignalException(true, true, tte, this);
         } catch (ShutdownSignalException sse) {
             if (!abort)
                 throw sse;

src/com/rabbitmq/client/impl/ChannelN.java

@@ -65,8 +65,6 @@
 public class ChannelN extends AMQChannel implements com.rabbitmq.client.Channel {
     private static final String UNSPECIFIED_OUT_OF_BAND = "";
 
-    public static final int CLOSING_TIMEOUT = 10000; // timeout in milliseconds
-
     /**
      * Map from consumer tag to {@link Consumer} instance.
      *
@@ -288,11 +286,9 @@ public void close(int closeCode,
         // quiescingRpc instead. We ignore the result. (It's always
         // close-ok.)
         try {
-            quiescingRpc(reason,
-                         CLOSING_TIMEOUT,
-                         new AMQCommand(new Channel.CloseOk()));
+            quiescingRpc(reason, -1);
         } catch (TimeoutException ise) {
-            // FIXME: propagate it to the user
+            // Will never happen since we wait infinitely
         } catch (ShutdownSignalException sse) {
             // Ignore.
         }