Check for _disposed when using _connectionShutdown member

Author: lukebakken

projects/RabbitMQ.Client/client/impl/Connection.cs

@@ -58,6 +58,7 @@ namespace RabbitMQ.Client.Framing.Impl
 {
     internal sealed class Connection : IConnection
     {
+        private bool _disposed = false;
         private readonly object _eventLock = new object();
 
         ///<summary>Heartbeat frame for transmission. Reusable across connections.</summary>
@@ -137,6 +138,11 @@ public event EventHandler<ShutdownEventArgs> ConnectionShutdown
         {
             add
             {
+                if (_disposed)
+                {
+                    throw new ObjectDisposedException(GetType().FullName);
+                }
+
                 bool ok = false;
                 lock (_eventLock)
                 {
@@ -153,6 +159,11 @@ public event EventHandler<ShutdownEventArgs> ConnectionShutdown
             }
             remove
             {
+                if (_disposed)
+                {
+                    throw new ObjectDisposedException(GetType().FullName);
+                }
+
                 lock (_eventLock)
                 {
                     _connectionShutdown -= value;
@@ -675,6 +686,11 @@ public void OnConnectionUnblocked()
         ///<summary>Broadcasts notification of the final shutdown of the connection.</summary>
         public void OnShutdown()
         {
+            if (_disposed)
+            {
+                throw new ObjectDisposedException(GetType().FullName);
+            }
+
             EventHandler<ShutdownEventArgs> handler;
             ShutdownEventArgs reason;
             lock (_eventLock)
@@ -1024,6 +1040,11 @@ void IDisposable.Dispose()
 
         private void Dispose(bool disposing)
         {
+            if (_disposed)
+            {
+                return;
+            }
+
             if (disposing)
             {
                 // dispose managed resources
@@ -1039,6 +1060,7 @@ private void Dispose(bool disposing)
                 finally
                 {
                     _connectionShutdown = null;
+                    _disposed = true;
                 }
             }