add more stringent test to channel disconnection

Author: David R. MacIver

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

@@ -113,8 +113,8 @@ public class AMQConnection extends ShutdownNotifierComponent implements Connecti
      * Protected API - respond, in the driver thread, to a ShutdownSignal.
      * @param channelNumber the number of the channel to disconnect
      */
-    public final void disconnectChannel(int channelNumber) {
-        _channelManager.disconnectChannel(channelNumber);
+    public final void disconnectChannel(ChannelN channel) {
+        _channelManager.disconnectChannel(channel);
     }
 
     public void ensureIsOpen()

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

@@ -86,8 +86,8 @@ public void handleSignal(ShutdownSignalException signal) {
         synchronized(_channelMap) {
             channels = new HashSet<ChannelN>(_channelMap.values());
         }
-        for (AMQChannel channel : channels) {
-            disconnectChannel(channel.getChannelNumber());
+        for (ChannelN channel : channels) {
+            disconnectChannel(channel);
             channel.processShutdownSignal(signal, true, true);
         }
     }
@@ -126,13 +126,13 @@ private void addChannel(ChannelN chan) {
         _channelMap.put(chan.getChannelNumber(), chan);
     }
 
-    public synchronized void disconnectChannel(int channelNumber) {
-        if (_channelMap.remove(channelNumber) == null)
+    public synchronized void disconnectChannel(ChannelN channel) {
+        int channelNumber = channel.getChannelNumber();
+        if (_channelMap.remove(channelNumber) != channel)
             throw new IllegalStateException(
                 "We have attempted to "
                 + "create a disconnect a channel that's no longer in "
                 + "use. This should never happen. Please report this as a bug.");
-        System.err.println("DISCONN CH" + channelNumber);
         channelNumberAllocator.free(channelNumber);
     }
 }

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

@@ -166,7 +166,7 @@ public void broadcastShutdownSignal(ShutdownSignalException signal) {
     }
 
     public void releaseChannelNumber() {
-        _connection.disconnectChannel(_channelNumber);
+        _connection.disconnectChannel(this);
     }
 
     /**