Merging bug22895 into default

Author: Simon MacMullen

projects/client/RabbitMQ.Client/src/client/impl/ConnectionBase.cs

@@ -86,7 +86,7 @@ public abstract class ConnectionBase : IConnection
         public static int HandshakeTimeout = 10000;
 
         ///<summary>Timeout used while waiting for a
-        ///connection.close-ok reply to a connection close request
+        ///connection.close-ok reply to a connection.close request
         ///(milliseconds)</summary>
         public static int ConnectionCloseTimeout = 10000;
 
@@ -368,25 +368,25 @@ void IDisposable.Dispose()
             }
         }
 
-        ///<summary>API-side invocation of connection close.</summary>
+        ///<summary>API-side invocation of connection.close.</summary>
         public void Close()
         {
             Close(CommonFraming.Constants.ReplySuccess, "Goodbye", Timeout.Infinite);
         }
 
-        ///<summary>API-side invocation of connection close.</summary>
+        ///<summary>API-side invocation of connection.close.</summary>
         public void Close(ushort reasonCode, string reasonText)
         {
             Close(reasonCode, reasonText, Timeout.Infinite);
         }
 
-        ///<summary>API-side invocation of connection close with timeout.</summary>
+        ///<summary>API-side invocation of connection.close with timeout.</summary>
         public void Close(int timeout)
         {
             Close(CommonFraming.Constants.ReplySuccess, "Goodbye", timeout);
         }
 
-        ///<summary>API-side invocation of connection close with timeout.</summary>
+        ///<summary>API-side invocation of connection.close with timeout.</summary>
         public void Close(ushort reasonCode, string reasonText, int timeout)
         {
             Close(new ShutdownEventArgs(ShutdownInitiator.Application, reasonCode, reasonText), false, timeout);
@@ -460,7 +460,7 @@ public void Close(ShutdownEventArgs reason, bool abort, int timeout)
 
             try
             {
-                // Try to send connection close
+                // Try to send connection.close
                 // Wait for CloseOk in the MainLoop
                 m_session0.Transmit(ConnectionCloseWrapper(reason.ReplyCode,
                                                           reason.ReplyText));
@@ -637,7 +637,8 @@ public void MainLoop()
             }
 
             // If allowed for clean shutdown
-            // Run limited version of the main loop
+            // Run main loop for a limited amount of time (as defined
+            // by ConnectionCloseTimeout).
             if (shutdownCleanly)
             {
                 ClosingLoop();
@@ -790,8 +791,9 @@ public void NotifyReceivedCloseOk()
         ///<summary>
         /// Sets the channel named in the SoftProtocolException into
         /// "quiescing mode", where we issue a channel.close and
-        /// ignore everything up to the channel.close-ok reply that
-        /// should eventually arrive.
+        /// ignore everything except for subsequent channel.close
+        /// messages and the channel.close-ok reply that should
+        /// eventually arrive.
         ///</summary>
         ///<remarks>
         ///<para>
@@ -816,23 +818,12 @@ public void NotifyReceivedCloseOk()
         ///</para>
         ///</remarks>
         public void QuiesceChannel(SoftProtocolException pe) {
-            // First, construct the close request and QuiescingSession
-            // that we'll use during the quiesce process.
-
-            Command request;
-            int replyClassId;
-            int replyMethodId;
-            Protocol.CreateChannelClose(pe.ReplyCode,
-                                        pe.Message,
-                                        out request,
-                                        out replyClassId,
-                                        out replyMethodId);
+            // Construct the QuiescingSession that we'll use during
+            // the quiesce process.
 
             ISession newSession = new QuiescingSession(this,
                                                        pe.Channel,
-                                                       pe.ShutdownReason,
-                                                       replyClassId,
-                                                       replyMethodId);
+                                                       pe.ShutdownReason);
 
             // Here we detach the session from the connection. It's
             // still alive: it just won't receive any further frames
@@ -851,7 +842,7 @@ public void QuiesceChannel(SoftProtocolException pe) {
             // our peer. The peer will respond through the lower
             // layers - specifically, through the QuiescingSession we
             // installed above.
-            newSession.Transmit(request);
+            newSession.Transmit(ChannelCloseWrapper(pe.ReplyCode, pe.Message));
         }
 
         public void HandleMainLoopException(ShutdownEventArgs reason) {
@@ -959,7 +950,19 @@ public Command ConnectionCloseWrapper(ushort reasonCode, string reasonText)
                                            out replyClassId,
                                            out replyMethodId);
             return request;
-        } 
+        }
+
+        protected Command ChannelCloseWrapper(ushort reasonCode, string reasonText)
+        {
+            Command request;
+            int replyClassId, replyMethodId;
+            Protocol.CreateChannelClose(reasonCode,
+                                        reasonText,
+                                        out request,
+                                        out replyClassId,
+                                        out replyMethodId);
+            return request;
+        }
 
         private static uint NegotiatedMaxValue(uint clientValue, uint serverValue)
         {

projects/client/RabbitMQ.Client/src/client/impl/QuiescingSession.cs

@@ -65,45 +65,53 @@
 // the versions we support*. Obviously we may need to revisit this if
 // that ever changes.
 using CommonFraming = RabbitMQ.Client.Framing.v0_9;
+using CommonFramingSpecs = RabbitMQ.Client.Framing.Impl.v0_9;
 
 namespace RabbitMQ.Client.Impl
 {
     ///<summary>Small ISession implementation used during channel quiescing.</summary>
     public class QuiescingSession: SessionBase
     {
         public ShutdownEventArgs m_reason;
-        public int m_replyClassId;
-        public int m_replyMethodId;
 
         public QuiescingSession(ConnectionBase connection,
                                 int channelNumber,
-                                ShutdownEventArgs reason,
-                                int replyClassId,
-                                int replyMethodId)
+                                ShutdownEventArgs reason)
             : base(connection, channelNumber)
         {
             m_reason = reason;
-            m_replyClassId = replyClassId;
-            m_replyMethodId = replyMethodId;
         }
 
         public override void HandleFrame(Frame frame)
         {
             if (frame.Type == CommonFraming.Constants.FrameMethod) {
                 MethodBase method = Connection.Protocol.DecodeMethodFrom(frame.GetReader());
-                if ((method.ProtocolClassId == m_replyClassId)
-                    && (method.ProtocolMethodId == m_replyMethodId))
+                if ((method.ProtocolClassId == CommonFramingSpecs.ChannelCloseOk.ClassId)
+                    && (method.ProtocolMethodId == CommonFramingSpecs.ChannelCloseOk.MethodId))                 
                 {
                     // This is the reply we were looking for. Release
                     // the channel with the reason we were passed in
                     // our constructor.
                     Close(m_reason);
                     return;
                 }
+                else if ((method.ProtocolClassId == CommonFramingSpecs.ChannelClose.ClassId)
+                         && (method.ProtocolMethodId == CommonFramingSpecs.ChannelClose.MethodId))
+                {
+                    // We're already shutting down the channel, so
+                    // just send back an ok.
+                    Transmit(CreateChannelCloseOk());
+                    return;
+                }
+
             }
 
             // Either a non-method frame, or not what we were looking
             // for. Ignore it - we're quiescing.
         }
+
+        protected Command CreateChannelCloseOk() {
+            return new Command(new CommonFramingSpecs.ConnectionCloseOk());
+        }
     }
 }