Moved the code responsible for checking the type of the command that is about to be sent in the quiescing state to the version-specific ProtocolBase classes.

Author: Hubert Plociniczak

src/client/impl/AbstractProtocolBase.cs

@@ -89,6 +89,10 @@ public abstract void CreateChannelClose(ushort reasonCode,
                                                    out Command request,
                                                    out int replyClassId,
                                                    out int replyMethodId);
+                                                   
+        ///<summary>Used in the quiescing session to determine if the command
+        ///is allowed to be sent.</summary>
+        public abstract bool CanSendWhileClosed(Command cmd); 
 
         public AmqpVersion Version {
             get {

src/client/impl/SessionBase.cs

@@ -72,9 +72,6 @@ public abstract class SessionBase: ISession
 
         public readonly ConnectionBase m_connection;
         public readonly int m_channelNumber;
-        
-        public int m_channelCloseOkClassId;
-        public int m_channelCloseOkMethodId;
 
         public SessionBase(ConnectionBase connection, int channelNumber)
         {
@@ -83,12 +80,6 @@ public SessionBase(ConnectionBase connection, int channelNumber)
             if (channelNumber != 0)
                 connection.ConnectionShutdown +=
                     new ConnectionShutdownEventHandler(this.OnConnectionShutdown);
-            
-            Command request;
-            connection.Protocol.CreateChannelClose(0,"",
-            										out request,
-            										out m_channelCloseOkClassId,
-            										out m_channelCloseOkMethodId);
         }
 
         public virtual void OnCommandReceived(Command cmd)
@@ -180,10 +171,7 @@ public virtual void Transmit(Command cmd)
             {
                 if (m_closeReason != null)
                 {
-                    // Allow always for sending close ok
-               	    MethodBase method = cmd.m_method;
-               	    if ( (method.ProtocolClassId != m_channelCloseOkClassId)
-                  	    || (method.ProtocolMethodId != m_channelCloseOkMethodId))
+                    if (!m_connection.Protocol.CanSendWhileClosed(cmd))
                   	    throw new AlreadyClosedException(m_closeReason);
                 }
                 // We transmit *inside* the lock to avoid interleaving

src/client/impl/v0_8/ProtocolBase.cs

@@ -101,5 +101,13 @@ public override void CreateChannelClose(ushort reasonCode,
             replyClassId = RabbitMQ.Client.Framing.Impl.v0_8.ChannelCloseOk.ClassId;
             replyMethodId = RabbitMQ.Client.Framing.Impl.v0_8.ChannelCloseOk.MethodId;                                                                                     
         }
+        
+        public override bool CanSendWhileClosed(Command cmd)
+        {
+            return (cmd.m_method.ProtocolClassId
+                        == RabbitMQ.Client.Framing.Impl.v0_8.ChannelCloseOk.ClassId)
+                    && (cmd.m_method.ProtocolMethodId
+                        == RabbitMQ.Client.Framing.Impl.v0_8.ChannelCloseOk.MethodId);
+        }
     }
 }

src/client/impl/v0_8qpid/ProtocolBase.cs

@@ -101,5 +101,13 @@ public override void CreateChannelClose(ushort reasonCode,
             replyClassId = RabbitMQ.Client.Framing.Impl.v0_8qpid.ChannelCloseOk.ClassId;
             replyMethodId = RabbitMQ.Client.Framing.Impl.v0_8qpid.ChannelCloseOk.MethodId;                                                                                     
         }
+        
+        public override bool CanSendWhileClosed(Command cmd)
+        {
+            return (cmd.m_method.ProtocolClassId
+                        == RabbitMQ.Client.Framing.Impl.v0_8qpid.ChannelCloseOk.ClassId)
+                    && (cmd.m_method.ProtocolMethodId
+                        == RabbitMQ.Client.Framing.Impl.v0_8qpid.ChannelCloseOk.MethodId);
+        }
     }
 }

src/client/impl/v0_9/ProtocolBase.cs

@@ -101,5 +101,13 @@ public override void CreateChannelClose(ushort reasonCode,
             replyClassId = RabbitMQ.Client.Framing.Impl.v0_9.ChannelCloseOk.ClassId;
             replyMethodId = RabbitMQ.Client.Framing.Impl.v0_9.ChannelCloseOk.MethodId;                                                                                     
         }
+        
+        public override bool CanSendWhileClosed(Command cmd)
+        {
+            return (cmd.m_method.ProtocolClassId
+                        == RabbitMQ.Client.Framing.Impl.v0_9.ChannelCloseOk.ClassId)
+                    && (cmd.m_method.ProtocolMethodId
+                        == RabbitMQ.Client.Framing.Impl.v0_9.ChannelCloseOk.MethodId);
+        }
     }
 }