Merge branch 'stable'

Author: michaelklishin

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

@@ -1024,8 +1024,10 @@ public void HeartbeatReadTimerCallback(object state)
                 {
                     _heartbeatReadTimer.Change(Heartbeat * 1000, Timeout.Infinite);
                 }
-            } catch (ObjectDisposedException)
+            }
+            catch (ObjectDisposedException ignored)
             {
+
                 // timer is already disposed,
                 // e.g. due to shutdown
             }
@@ -1059,7 +1061,8 @@ public void HeartbeatWriteTimerCallback(object state)
                     TerminateMainloop();
                     FinishClose();
                 }
-            } catch (ObjectDisposedException)
+            }
+            catch (ObjectDisposedException ignored)
             {
                 // timer is already disposed,
                 // e.g. due to shutdown
@@ -1068,21 +1071,22 @@ public void HeartbeatWriteTimerCallback(object state)
 
         protected void MaybeStopHeartbeatTimers()
         {
-            MaybeDisposeTimer(_heartbeatReadTimer);
-            MaybeDisposeTimer(_heartbeatWriteTimer);
+            MaybeDisposeTimer(ref _heartbeatReadTimer);
+            MaybeDisposeTimer(ref _heartbeatWriteTimer);
         }
 
-        private void MaybeDisposeTimer(Timer timer)
+        private void MaybeDisposeTimer(ref Timer timer)
         {
             if (timer != null)
             {
                 try
                 {
                     timer.Change(Timeout.Infinite, Timeout.Infinite);
                     timer.Dispose();
-                } catch (ObjectDisposedException)
+                }
+                catch (ObjectDisposedException ignored)
                 {
-                    // we are shutting down, ignore
+                    timer = null;
                 }
             }
         }