merge bug19497 into default

Author: Matthias Radestock

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

@@ -172,6 +172,22 @@ public void releaseChannelNumber() {
         // incoming commands except for a close-ok.
 
         Method method = command.getMethod();
+
+        if (method instanceof Channel.Close) {
+            // Channel should always respond to Channel.Close
+            // from the server
+            releaseChannelNumber();
+            ShutdownSignalException signal = new ShutdownSignalException(false,
+                                                                         false,
+                                                                         command,
+                                                                         this);
+            synchronized(this) {
+                processShutdownSignal(signal, true, true);
+                quiescingTransmit(new Channel.CloseOk());
+            }
+            notifyListeners();
+            return true;
+        }
         if (isOpen()) {
             // We're in normal running mode.
 
@@ -219,18 +235,6 @@ public void releaseChannelNumber() {
                     }
                 }
                 return true;
-            } else if (method instanceof Channel.Close) {
-                releaseChannelNumber();
-                ShutdownSignalException signal = new ShutdownSignalException(false,
-                                                                             false,
-                                                                             command,
-                                                                             this);
-                synchronized(this) {
-                    processShutdownSignal(signal, true, true);
-                    quiescingTransmit(new Channel.CloseOk());
-                }
-                notifyListeners();
-                return true;
             } else {
                 return false;
             }