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

lukebakken · lukebakken · commit 7348bc271b63 · 2020-03-12T17:01:03.000-07:00
Catch ObjectDisposedException case (cherry picked from commit 313e1e8)
diff --git a/projects/client/RabbitMQ.Client/src/client/impl/Connection.cs b/projects/client/RabbitMQ.Client/src/client/impl/Connection.cs
@@ -1122,6 +1122,7 @@ public void HeartbeatWriteTimerCallback(object state)
                 if (!m_closed)
                 {
                     WriteFrame(m_heartbeatFrame);
+                    _heartbeatWriteTimer?.Change((int)m_heartbeatTimeSpan.TotalMilliseconds, Timeout.Infinite);
                 }
             }
             catch (ObjectDisposedException)
@@ -1134,11 +1135,6 @@ public void HeartbeatWriteTimerCallback(object state)
                 // ignore, let the read callback detect
                 // peer unavailability. See rabbitmq/rabbitmq-dotnet-client#638 for details.
             }
-
-            if (m_closed == false)
-            {
-                _heartbeatWriteTimer?.Change((int)m_heartbeatTimeSpan.TotalMilliseconds, Timeout.Infinite);
-            }
         }
 
         protected void MaybeStopHeartbeatTimers()

Original file line number	Diff line number	Diff line change
`@@ -1122,6 +1122,7 @@ public void HeartbeatWriteTimerCallback(object state)`
`1122`	`1122`	`if (!m_closed)`
`1123`	`1123`	`{`
`1124`	`1124`	`WriteFrame(m_heartbeatFrame);`
	`1125`	`+ _heartbeatWriteTimer?.Change((int)m_heartbeatTimeSpan.TotalMilliseconds, Timeout.Infinite);`
`1125`	`1126`	`}`
`1126`	`1127`	`}`
`1127`	`1128`	`catch (ObjectDisposedException)`
`@@ -1134,11 +1135,6 @@ public void HeartbeatWriteTimerCallback(object state)`
`1134`	`1135`	`// ignore, let the read callback detect`
`1135`	`1136`	`// peer unavailability. See rabbitmq/rabbitmq-dotnet-client#638 for details.`
`1136`	`1137`	`}`
`1137`		`-`
`1138`		`- if (m_closed == false)`
`1139`		`- {`
`1140`		`- _heartbeatWriteTimer?.Change((int)m_heartbeatTimeSpan.TotalMilliseconds, Timeout.Infinite);`
`1141`		`- }`
`1142`	`1138`	`}`
`1143`	`1139`
`1144`	`1140`	`protected void MaybeStopHeartbeatTimers()`