Rebase bug21849

Author: Emile Joubert

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

@@ -544,9 +544,18 @@ public boolean processControlCommand(Command c)
         // See the detailed comments in ChannelN.processAsync.
 
         Method method = c.getMethod();
-        
+
         if (method instanceof AMQP.Connection.Close) {
-            handleConnectionClose(c);
+            if (isOpen()) {
+                handleConnectionClose(c);
+            } else {
+                // Already shutting down, so just send back a CloseOk.
+                try {
+                    _channel0.quiescingTransmit(new AMQImpl.Connection.CloseOk());
+                } catch (IOException ioe) {
+                    Utility.emptyStatement();
+                }
+            }
             return true;
         } else {
             if (isOpen()) {