merge bug19793 into default

Author: tonyg

src/client/api/IModel.cs

@@ -358,13 +358,55 @@ BasicGetResult BasicGet(string queue,
 
         ///<summary>Close this session.</summary>
         ///<remarks>
-        /// If the session is already closed (or closing), then this
-        /// method does nothing but wait for the in-progress close
-        /// operation to complete. This method will not return to the
-        /// caller until the shutdown is complete.
+        ///If the session is already closed (or closing), then this
+        ///method does nothing but wait for the in-progress close
+        ///operation to complete. This method will not return to the
+        ///caller until the shutdown is complete.
+        ///</remarks>
+        [AmqpMethodDoNotImplement(null)]
+        void Close();
+        
+        ///<summary>Close this session.</summary>
+        ///<remarks>
+        ///The method behaves in the same way as Close(), with the only
+        ///difference that the model is closed with the given model
+        ///close code and message.
+        ///<para>
+        ///The close code (See under "Reply Codes" in the AMQP specification)
+        ///</para>
+        ///<para>
+        ///A message indicating the reason for closing the model
+        ///</para>
         ///</remarks>
         [AmqpMethodDoNotImplement(null)]
         void Close(ushort replyCode, string replyText);
+        
+        ///<summary>Abort this session.</summary>
+        ///<remarks>
+        ///If the session is already closed (or closing), then this
+        ///method does nothing but wait for the in-progress close
+        ///operation to complete. This method will not return to the
+        ///caller until the shutdown is complete.
+        ///In comparison to normal Close() method, Abort() will not throw
+        ///AlreadyClosedException or IOException during closing model.
+        ///</remarks>
+        [AmqpMethodDoNotImplement(null)]
+        void Abort();
+        
+        ///<summary>Abort this session.</summary>
+        ///<remarks>
+        ///The method behaves in the same way as Abort(), with the only
+        ///difference that the model is closed with the given model
+        ///close code and message.
+        ///<para>
+        ///The close code (See under "Reply Codes" in the AMQP specification)
+        ///</para>
+        ///<para>
+        ///A message indicating the reason for closing the model
+        ///</para>
+        ///</remarks>
+        [AmqpMethodDoNotImplement(null)]
+        void Abort(ushort replyCode, string replyText);
     }
 
     ///<summary>Represents Basic.GetOk responses from the server.</summary>

src/client/impl/ModelBase.cs

@@ -775,22 +775,49 @@ public abstract void BasicReject(ulong deliveryTag,
 
         void IDisposable.Dispose()
         {
-            Close(200, "");
+            Close();
+        }
+        
+        public void Close()
+        {
+        	Close(200, "Goodbye");
         }
 
-        public void Close(ushort replyCode, string replyText)
+		public void Close(ushort replyCode, string replyText)
+        {
+        	Close(replyCode, replyText, false);
+        }
+        
+        public void Abort() 
+        {
+            Abort(200, "Goodbye");
+        }
+        
+        public void Abort(ushort replyCode, string replyText)
+        {
+            Close(replyCode, replyText, true);
+        }
+        
+        public void Close(ushort replyCode, string replyText, bool abort)
         {
             ShutdownContinuation k = new ShutdownContinuation();
             ModelShutdown += new ModelShutdownEventHandler(k.OnShutdown);
-
-            if (SetCloseReason(new ShutdownEventArgs(ShutdownInitiator.Application,
-                                 replyCode,
-                                 replyText)))
-            {
-                _Private_ChannelClose(replyCode, replyText, 0, 0);
+            
+            try {
+                if (SetCloseReason(new ShutdownEventArgs(ShutdownInitiator.Application,
+                                     replyCode,
+                                     replyText)))
+                {
+                    _Private_ChannelClose(replyCode, replyText, 0, 0);
+                }
+                k.Wait();
+            } catch (AlreadyClosedException ace) {
+            	if (!abort)
+            		throw ace;
+            } catch (IOException ioe) {
+            	if (!abort)
+            		throw ioe;
             }
-
-            k.Wait();
         }
 
         public void HandleChannelCloseOk()