merge bug20349 into v1_5

Author: Matthias Radestock

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/ConnectionBase.cs

@@ -348,7 +348,6 @@ void IDisposable.Dispose()
             	    if (entry.Exception != null)
             	        throw entry.Exception;
             	}
-            	
             	throw new OperationInterruptedException(null);
             }
         }

src/client/impl/ISession.cs

@@ -69,11 +69,13 @@ public interface ISession {
         event SessionShutdownEventHandler SessionShutdown;
 
         int ChannelNumber { get; }
-	IConnection Connection { get; }
-	ShutdownEventArgs CloseReason { get; }
+        IConnection Connection { get; }
+        ShutdownEventArgs CloseReason { get; }
         bool IsOpen { get; }
         void HandleFrame(Frame frame);
         void Transmit(Command cmd);
         void Close(ShutdownEventArgs reason);
+        void Close(ShutdownEventArgs reason, bool notify);
+        void Notify();
     }
 }

src/client/impl/ModelBase.cs

@@ -467,8 +467,13 @@ public void HandleChannelClose(ushort replyCode,
                              replyText,
                              classId,
                              methodId));
-            FinishClose();
-            _Private_ChannelCloseOk();
+            
+            m_session.Close(m_closeReason, false);
+            try {
+                _Private_ChannelCloseOk();
+            } finally {
+                m_session.Notify();
+            }
         }
 
         public void FinishClose()

src/client/impl/SessionBase.cs

@@ -171,7 +171,8 @@ public virtual void Transmit(Command cmd)
             {
                 if (m_closeReason != null)
                 {
-                    throw new AlreadyClosedException(m_closeReason);
+                    if (!m_connection.Protocol.CanSendWhileClosed(cmd))
+                  	    throw new AlreadyClosedException(m_closeReason);
                 }
                 // We transmit *inside* the lock to avoid interleaving
                 // of frames within a channel.
@@ -180,6 +181,11 @@ public virtual void Transmit(Command cmd)
         }
 
         public void Close(ShutdownEventArgs reason)
+        {
+            Close(reason, true);
+        }
+        
+        public void Close(ShutdownEventArgs reason, bool notify)
         {
             lock (m_shutdownLock)
             {
@@ -188,7 +194,19 @@ public void Close(ShutdownEventArgs reason)
                     m_closeReason = reason;
                 }
             }
-
+            if (notify)
+                OnSessionShutdown(m_closeReason);
+        }
+        
+        public void Notify()
+        {
+            // Ensure that we notify only when session is already closed
+            // If not, throw exception, since this is a serious bug in the library
+            lock (m_shutdownLock)
+            {
+        	    if (m_closeReason == null)
+                    throw new Exception("Internal Error in Session.Close");   	
+            }
             OnSessionShutdown(m_closeReason);
         }
     }

src/client/impl/v0_8/ProtocolBase.cs

@@ -101,5 +101,10 @@ 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 is RabbitMQ.Client.Framing.Impl.v0_8.ChannelCloseOk;
+        }
     }
 }

src/client/impl/v0_8qpid/ProtocolBase.cs

@@ -101,5 +101,10 @@ 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 is RabbitMQ.Client.Framing.Impl.v0_8qpid.ChannelCloseOk;
+        }
     }
 }

src/client/impl/v0_9/ProtocolBase.cs

@@ -101,5 +101,10 @@ 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 is RabbitMQ.Client.Framing.Impl.v0_9.ChannelCloseOk;
+        }
     }
 }