Rework handleChannelKiller to close channel only (if possible).

Author: Steve Powell

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

@@ -19,6 +19,7 @@
 import java.io.IOException;
 
 import com.rabbitmq.client.AMQP;
+import com.rabbitmq.client.AlreadyClosedException;
 import com.rabbitmq.client.Channel;
 import com.rabbitmq.client.Connection;
 import com.rabbitmq.client.Consumer;
@@ -55,23 +56,27 @@ public void handleConsumerException(Channel channel, Throwable exception,
                                               + " for channel " + channel);
     }
 
-    protected void handleChannelKiller(Channel channel,
-                                       Throwable exception,
-                                       String what)
-    {
-        // TODO: Convert to logging framework
-        System.err.println(what + " threw an exception for channel " +
-                           channel + ":");
+    protected void handleChannelKiller(Channel channel, Throwable exception, String what) {
+        // TODO: log the exception
+        System.err.println(what + " threw an exception for channel " + channel + ":");
         exception.printStackTrace();
         try {
-            ((AMQConnection) channel.getConnection()).close(AMQP.INTERNAL_ERROR,
-                                                            "Internal error in " + what,
-                                                            false,
-                                                            exception);
+            channel.close();
+        } catch (AlreadyClosedException ace) {
+            //noop
         } catch (IOException ioe) {
-            // Man, this clearly isn't our day.
-            // Ignore the exception? TODO: Log the nested failure
+            // TODO: log the failure
+            System.err.println("Failure during close of channel " + channel + " after " + exception + ":");
+            ioe.printStackTrace();
+            AMQConnection conn = (AMQConnection) channel.getConnection();
+            try {
+                conn.close(AMQP.INTERNAL_ERROR, "Internal error closing channel for " + what,
+                        false, ioe);
+            } catch (IOException ioeH) {
+                // TODO: log the failure
+                System.err.println("Failure during close of connection " + conn + " after " + ioe + ":");
+                ioeH.printStackTrace();
+            }
         }
-
     }
 }