Merge pull request #757 from rabbitmq/lrb-fix-timer-disposed-exception

lukebakken · web-flow · commit 313e1e8ac1ff · 2020-03-12T16:43:23.000-07:00
Catch ObjectDisposedException case
diff --git a/projects/client/RabbitMQ.Client/src/client/impl/Connection.cs b/projects/client/RabbitMQ.Client/src/client/impl/Connection.cs
@@ -901,6 +901,7 @@ public void HeartbeatWriteTimerCallback(object state)
                 if (!_closed)
                 {
                     WriteFrame(_heartbeatFrame);
+                    _heartbeatWriteTimer?.Change((int)_heartbeatTimeSpan.TotalMilliseconds, Timeout.Infinite);
                 }
             }
             catch (ObjectDisposedException)
@@ -913,11 +914,6 @@ public void HeartbeatWriteTimerCallback(object state)
                 // ignore, let the read callback detect
                 // peer unavailability. See rabbitmq/rabbitmq-dotnet-client#638 for details.
             }
-
-            if (_closed == false)
-            {
-                _heartbeatWriteTimer?.Change((int)_heartbeatTimeSpan.TotalMilliseconds, Timeout.Infinite);
-            }
         }
 
         void MaybeStopHeartbeatTimers()

Original file line number	Diff line number	Diff line change
`@@ -901,6 +901,7 @@ public void HeartbeatWriteTimerCallback(object state)`
`901`	`901`	`if (!_closed)`
`902`	`902`	`{`
`903`	`903`	`WriteFrame(_heartbeatFrame);`
	`904`	`+ _heartbeatWriteTimer?.Change((int)_heartbeatTimeSpan.TotalMilliseconds, Timeout.Infinite);`
`904`	`905`	`}`
`905`	`906`	`}`
`906`	`907`	`catch (ObjectDisposedException)`
`@@ -913,11 +914,6 @@ public void HeartbeatWriteTimerCallback(object state)`
`913`	`914`	`// ignore, let the read callback detect`
`914`	`915`	`// peer unavailability. See rabbitmq/rabbitmq-dotnet-client#638 for details.`
`915`	`916`	`}`
`916`		`-`
`917`		`- if (_closed == false)`
`918`		`- {`
`919`		`- _heartbeatWriteTimer?.Change((int)_heartbeatTimeSpan.TotalMilliseconds, Timeout.Infinite);`
`920`		`- }`
`921`	`917`	`}`
`922`	`918`
`923`	`919`	`void MaybeStopHeartbeatTimers()`