merge bug19484 into default

Author: Matthias Radestock

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

@@ -71,7 +71,8 @@ public void handleSignal(ShutdownSignalException signal) {
             try {
                 channel.processShutdownSignal(signal);
             } catch (ShutdownSignalException sse) {
-                // Ignore already closed channels
+                // Notify channels that are waiting for rpc
+                channel.notifyOutstandingRpc(signal);
             }
         }
     }

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

@@ -296,17 +296,16 @@ public void close(int closeCode,
             k.getReply(-1);
         } catch (TimeoutException ise) {
             // Will never happen since we wait infinitely
-        } catch (ShutdownSignalException sse) {
-            // Ignore.
-        }
+        } finally {
 
-        // Now we know everything's been cleaned up and there should
-        // be no more surprises arriving on the wire. Release the
-        // channel number, and dissociate this ChannelN instance from
-        // our connection so that any further frames inbound on this
-        // channel can be caught as the errors they are.
-        releaseChannelNumber();
-        notifyListeners();
+            // Now we know everything's been cleaned up and there should
+            // be no more surprises arriving on the wire. Release the
+            // channel number, and dissociate this ChannelN instance from
+            // our connection so that any further frames inbound on this
+            // channel can be caught as the errors they are.
+            releaseChannelNumber();
+            notifyListeners();
+        }
     }
 
     /**