Re-throw timeout exception unless aborting

michaelklishin · michaelklishin · commit 3f2dc78dd388 · 2015-04-23T20:30:34.000+03:00
diff --git a/src/com/rabbitmq/client/impl/ChannelN.java b/src/com/rabbitmq/client/impl/ChannelN.java
@@ -537,8 +537,7 @@ protected void close(int closeCode,
                       boolean initiatedByApplication,
                       Throwable cause,
                       boolean abort)
-        throws IOException
-    {
+        throws IOException, TimeoutException {
         // First, notify all our dependents that we are shutting down.
         // This clears isOpen(), so no further work from the
         // application side will be accepted, and any inbound commands
@@ -571,11 +570,11 @@ public AMQCommand transformReply(AMQCommand command) {
             // we wait for the reply. We ignore the result.
             // (It's NOT always close-ok.)
             notify = true;
-			// Should not wait indefinately, since if the server is congested
-			// the call will lock and never return. This stalls and kills the current thread.
+			      // do not wait indefinitely
             k.getReply(10000);
         } catch (TimeoutException ise) {
-            // Will never happen since we wait infinitely
+            if (!abort)
+                throw ise;
         } catch (ShutdownSignalException sse) {
             if (!abort)
                 throw sse;
