Merge branch 'stable'

Conflicts: projects/client/RabbitMQ.Client/src/client/impl/Connection.cs
rabbitmq · Aug 2, 2016 · 3d355ec · 3d355ec
2 parents a2feb24 + 6f82824
commit 3d355ec
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/projects/client/RabbitMQ.Client/src/client/impl/Connection.cs b/projects/client/RabbitMQ.Client/src/client/impl/Connection.cs
@@ -1079,16 +1079,23 @@ protected void MaybeStopHeartbeatTimers()
 
         private void MaybeDisposeTimer(ref Timer timer)
         {
-            if (timer != null)
+            // capture the timer to reduce chance of a null ref exception
+            var captured = timer;
+            if (captured != null)
             {
                 try
                 {
-                    timer.Change(Timeout.Infinite, Timeout.Infinite);
-                    timer.Dispose();
+                    captured.Change(Timeout.Infinite, Timeout.Infinite);
+                    captured.Dispose();
+                    timer = null;
                 }
                 catch (ObjectDisposedException)
                 {
-                    timer = null;
+                    // we are shutting down, ignore
+                }
+                catch(NullReferenceException)
+                {
+                    // this should be very rare but could occur from a race condition
                 }
             }
         }