ThinkLib
diff --git a/‎src/com/rabbitmq/client/Channel.java
Lines changed: 2 additions & 2 deletions b/‎src/com/rabbitmq/client/Channel.java
Lines changed: 2 additions & 2 deletions
diff --git a/‎src/com/rabbitmq/client/impl/ChannelN.java
Lines changed: 17 additions & 15 deletions b/‎src/com/rabbitmq/client/impl/ChannelN.java
Lines changed: 17 additions & 15 deletions
@@ -77,7 +77,7 @@ public interface Channel extends ShutdownNotifier {
      *
      * @throws java.io.IOException if an error is encountered
      */
-    void close() throws IOException;
+    void close() throws IOException, TimeoutException;
 
     /**
      * Close this channel.
@@ -86,7 +86,7 @@ public interface Channel extends ShutdownNotifier {
      * @param closeMessage a message indicating the reason for closing the connection
      * @throws java.io.IOException if an error is encountered
      */
-    void close(int closeCode, String closeMessage) throws IOException;
+    void close(int closeCode, String closeMessage) throws IOException, TimeoutException;
 
     /**
      * Indicates whether the server has asked this client to stop
 
@@ -422,22 +422,22 @@ protected void processDelivery(Command command, Basic.Deliver method) {
                                            command.getContentBody());
         } catch (Throwable ex) {
             getConnection().getExceptionHandler().handleConsumerException(this,
-                                                                          ex,
-                                                                          callback,
-                                                                          m.getConsumerTag(),
-                                                                          "handleDelivery");
+                ex,
+                callback,
+                m.getConsumerTag(),
+                "handleDelivery");
         }
     }
 
     private void callReturnListeners(Command command, Basic.Return basicReturn) {
         try {
             for (ReturnListener l : this.returnListeners) {
                 l.handleReturn(basicReturn.getReplyCode(),
-                               basicReturn.getReplyText(),
-                               basicReturn.getExchange(),
-                               basicReturn.getRoutingKey(),
-             (BasicProperties) command.getContentHeader(),
-                               command.getContentBody());
+                    basicReturn.getReplyText(),
+                    basicReturn.getExchange(),
+                    basicReturn.getRoutingKey(),
+                    (BasicProperties) command.getContentHeader(),
+                    command.getContentBody());
             }
         } catch (Throwable ex) {
             getConnection().getExceptionHandler().handleReturnListenerException(this, ex);
@@ -493,15 +493,13 @@ private void asyncShutdown(Command command) throws IOException {
 
     /** Public API - {@inheritDoc} */
     public void close()
-        throws IOException
-    {
+        throws IOException, TimeoutException {
         close(AMQP.REPLY_SUCCESS, "OK");
     }
 
     /** Public API - {@inheritDoc} */
     public void close(int closeCode, String closeMessage)
-        throws IOException
-    {
+        throws IOException, TimeoutException {
         close(closeCode, closeMessage, true, null, false);
     }
 
@@ -517,8 +515,12 @@ public void abort(int closeCode, String closeMessage)
         throws IOException
     {
         try {
-            close(closeCode, closeMessage, true, null, true);
-        } catch (IOException _e) { /* ignored */ }
+          close(closeCode, closeMessage, true, null, true);
+        } catch (IOException _e) {
+        /* ignored */
+        } catch (TimeoutException _e) {
+          /* ignored */
+        }
     }
 
     /**