Merge branch 'IDisposable' of https://github.com/paulomorgado/rabbitmq-dotnet-client into paulomorgado-IDisposable

Author: kjnilsson

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

@@ -76,8 +76,7 @@ public class AutorecoveringConnection : IConnection, IRecoverable
         private ConcurrentDictionary<RecordedBinding, byte> m_recordedBindings =
             new ConcurrentDictionary<RecordedBinding, byte>();
 
-        private List<EventHandler<ConnectionBlockedEventArgs>> m_recordedBlockedEventHandlers =
-            new List<EventHandler<ConnectionBlockedEventArgs>>();
+        private EventHandler<ConnectionBlockedEventArgs> m_recordedBlockedEventHandlers;
 
         private IDictionary<string, RecordedConsumer> m_recordedConsumers =
             new ConcurrentDictionary<string, RecordedConsumer>();
@@ -88,16 +87,11 @@ public class AutorecoveringConnection : IConnection, IRecoverable
         private IDictionary<string, RecordedQueue> m_recordedQueues =
             new ConcurrentDictionary<string, RecordedQueue>();
 
-        private List<EventHandler<ShutdownEventArgs>> m_recordedShutdownEventHandlers =
-            new List<EventHandler<ShutdownEventArgs>>();
-
-        private List<EventHandler<EventArgs>> m_recordedUnblockedEventHandlers =
-            new List<EventHandler<EventArgs>>();
-
+        private EventHandler<ShutdownEventArgs> m_recordedShutdownEventHandlers;
+        private EventHandler<EventArgs> m_recordedUnblockedEventHandlers;
         private EventHandler<ConsumerTagChangedAfterRecoveryEventArgs> m_consumerTagChange;
         private EventHandler<QueueNameChangedAfterRecoveryEventArgs> m_queueNameChange;
         private EventHandler<EventArgs> m_recovery;
-
         private EventHandler<ConnectionRecoveryErrorEventArgs> m_connectionRecoveryError;
 
         public AutorecoveringConnection(ConnectionFactory factory, string clientProvidedName = null)
@@ -183,15 +177,15 @@ public event EventHandler<ConnectionBlockedEventArgs> ConnectionBlocked
             {
                 lock (m_eventLock)
                 {
-                    m_recordedBlockedEventHandlers.Add(value);
+                    m_recordedBlockedEventHandlers += value;
                     m_delegate.ConnectionBlocked += value;
                 }
             }
             remove
             {
                 lock (m_eventLock)
                 {
-                    m_recordedBlockedEventHandlers.Remove(value);
+                    m_recordedBlockedEventHandlers -= value;
                     m_delegate.ConnectionBlocked -= value;
                 }
             }
@@ -203,15 +197,15 @@ public event EventHandler<ShutdownEventArgs> ConnectionShutdown
             {
                 lock (m_eventLock)
                 {
-                    m_recordedShutdownEventHandlers.Add(value);
+                    m_recordedShutdownEventHandlers += value;
                     m_delegate.ConnectionShutdown += value;
                 }
             }
             remove
             {
                 lock (m_eventLock)
                 {
-                    m_recordedShutdownEventHandlers.Remove(value);
+                    m_recordedShutdownEventHandlers -= value;
                     m_delegate.ConnectionShutdown -= value;
                 }
             }
@@ -223,15 +217,15 @@ public event EventHandler<EventArgs> ConnectionUnblocked
             {
                 lock (m_eventLock)
                 {
-                    m_recordedUnblockedEventHandlers.Add(value);
+                    m_recordedUnblockedEventHandlers += value;
                     m_delegate.ConnectionUnblocked += value;
                 }
             }
             remove
             {
                 lock (m_eventLock)
                 {
-                    m_recordedUnblockedEventHandlers.Remove(value);
+                    m_recordedUnblockedEventHandlers -= value;
                     m_delegate.ConnectionUnblocked -= value;
                 }
             }
@@ -492,7 +486,7 @@ public void DeleteRecordedExchange(string name)
                 // find bindings that need removal, check if some auto-delete exchanges
                 // might need the same
                 var bs = m_recordedBindings.Keys.Where(b => name.Equals(b.Destination));
-                foreach (RecordedBinding b in bs)
+                foreach (var b in bs)
                 {
                     DeleteRecordedBinding(b);
                     MaybeDeleteRecordedAutoDeleteExchange(b.Source);
@@ -508,7 +502,7 @@ public void DeleteRecordedQueue(string name)
                 // find bindings that need removal, check if some auto-delete exchanges
                 // might need the same
                 var bs = m_recordedBindings.Keys.Where(b => name.Equals(b.Destination));
-                foreach (RecordedBinding b in bs)
+                foreach (var b in bs)
                 {
                     DeleteRecordedBinding(b);
                     MaybeDeleteRecordedAutoDeleteExchange(b.Source);
@@ -651,10 +645,7 @@ private void Init(IFrameHandler fh)
             lock (m_eventLock)
             {
                 ConnectionShutdown += recoveryListener;
-                if (!m_recordedShutdownEventHandlers.Contains(recoveryListener))
-                {
-                    m_recordedShutdownEventHandlers.Add(recoveryListener);
-                }
+                m_recordedShutdownEventHandlers += recoveryListener;
             }
         }
 
@@ -747,18 +738,32 @@ public void HandleConnectionUnblocked()
 
         void IDisposable.Dispose()
         {
-            try
-            {
-                Abort();
-            }
-            catch(Exception)
-            {
-                // TODO: log
-            }
-            finally
+            Dispose(true);
+        }
+
+        protected virtual void Dispose(bool disposing)
+        {
+            if (disposing)
             {
-                m_models.Clear();
+                // dispose managed resources
+                try
+                {
+                    Abort();
+                }
+                catch (Exception)
+                {
+                    // TODO: log
+                }
+                finally
+                {
+                    m_models.Clear();
+                    m_recordedBlockedEventHandlers = null;
+                    m_recordedShutdownEventHandlers = null;
+                    m_recordedUnblockedEventHandlers = null;
+                }
             }
+
+            // dispose unmanaged resources
         }
 
         protected void EnsureIsOpen()
@@ -815,13 +820,9 @@ protected void RecoverBindings()
 
         protected void RecoverConnectionBlockedHandlers()
         {
-            List<EventHandler<ConnectionBlockedEventArgs>> handler = m_recordedBlockedEventHandlers;
-            if (handler != null)
+            lock (m_eventLock)
             {
-                foreach (EventHandler<ConnectionBlockedEventArgs> eh in handler)
-                {
-                    m_delegate.ConnectionBlocked += eh;
-                }
+                m_delegate.ConnectionBlocked += m_recordedBlockedEventHandlers;
             }
         }
 
@@ -871,22 +872,12 @@ protected bool RecoverConnectionDelegate()
 
         protected void RecoverConnectionShutdownHandlers()
         {
-            foreach (EventHandler<ShutdownEventArgs> eh in m_recordedShutdownEventHandlers)
-            {
-                m_delegate.ConnectionShutdown += eh;
-            }
+            m_delegate.ConnectionShutdown += m_recordedShutdownEventHandlers;
         }
 
         protected void RecoverConnectionUnblockedHandlers()
         {
-            List<EventHandler<EventArgs>> handler = m_recordedUnblockedEventHandlers;
-            if (handler != null)
-            {
-                foreach (EventHandler<EventArgs> eh in handler)
-                {
-                    m_delegate.ConnectionUnblocked += eh;
-                }
-            }
+            m_delegate.ConnectionUnblocked += m_recordedUnblockedEventHandlers;
         }
 
         protected void RecoverConsumers()
@@ -1054,8 +1045,8 @@ protected void RunRecoveryEventHandlers()
         protected bool ShouldTriggerConnectionRecovery(ShutdownEventArgs args)
         {
             return (args.Initiator == ShutdownInitiator.Peer ||
-                // happens when EOF is reached, e.g. due to RabbitMQ node
-                // connectivity loss or abrupt shutdown
+                    // happens when EOF is reached, e.g. due to RabbitMQ node
+                    // connectivity loss or abrupt shutdown
                     args.Initiator == ShutdownInitiator.Library);
         }
     }