Merge pull request #106 from rabbitmq/rabbitmq-dotnet-client-105

Connection#Close should prevent automatic recovery attempts

Author: michaelklishin

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

@@ -60,6 +60,8 @@ public class AutorecoveringConnection : IConnection, IRecoverable
         public readonly object m_recordedEntitiesLock = new object();
         protected readonly TaskFactory recoveryTaskFactory = new TaskFactory();
         protected readonly object recoveryLockTarget = new object();
+        // used to block connection recovery attempts after Close() is unvoked
+        protected bool manuallyClosed = false;
         protected bool performingRecovery = false;
 
         protected List<AutorecoveringModel> m_models = new List<AutorecoveringModel>();
@@ -338,14 +340,17 @@ public void BeginAutomaticRecovery()
 
                     recoveryTaskFactory.StartNew(() =>
                     {
-                        try
-                        {
-                            Thread.Sleep(m_factory.NetworkRecoveryInterval);
-                            self.PerformAutomaticRecovery();
-                        }
-                        finally
+                        if(!self.manuallyClosed)
                         {
-                            performingRecovery = false;
+                            try
+                            {
+                                Thread.Sleep(m_factory.NetworkRecoveryInterval);
+                                self.PerformAutomaticRecovery();
+                            }
+                            finally
+                            {
+                                performingRecovery = false;
+                            }
                         }
                     });
                 }
@@ -576,48 +581,56 @@ public void init()
         ///<summary>API-side invocation of connection abort.</summary>
         public void Abort()
         {
+            this.manuallyClosed = true;
             m_delegate.Abort();
         }
 
         ///<summary>API-side invocation of connection abort.</summary>
         public void Abort(ushort reasonCode, string reasonText)
         {
+            this.manuallyClosed = true;
             m_delegate.Abort(reasonCode, reasonText);
         }
 
         ///<summary>API-side invocation of connection abort with timeout.</summary>
         public void Abort(int timeout)
         {
+            this.manuallyClosed = true;
             m_delegate.Abort(timeout);
         }
 
         ///<summary>API-side invocation of connection abort with timeout.</summary>
         public void Abort(ushort reasonCode, string reasonText, int timeout)
         {
+            this.manuallyClosed = true;
             m_delegate.Abort(reasonCode, reasonText, timeout);
         }
 
         ///<summary>API-side invocation of connection.close.</summary>
         public void Close()
         {
+            this.manuallyClosed = true;
             m_delegate.Close();
         }
 
         ///<summary>API-side invocation of connection.close.</summary>
         public void Close(ushort reasonCode, string reasonText)
         {
+            this.manuallyClosed = true;
             m_delegate.Close(reasonCode, reasonText);
         }
 
         ///<summary>API-side invocation of connection.close with timeout.</summary>
         public void Close(int timeout)
         {
+            this.manuallyClosed = true;
             m_delegate.Close(timeout);
         }
 
         ///<summary>API-side invocation of connection.close with timeout.</summary>
         public void Close(ushort reasonCode, string reasonText, int timeout)
         {
+            this.manuallyClosed = true;
             m_delegate.Close(reasonCode, reasonText, timeout);
         }