* Ignore OperationCanceledException in heartbeat loop if main loop is canceled

lukebakken · lukebakken · commit 1e42d0093e12 · 2024-05-09T10:55:52.000-07:00
diff --git a/projects/RabbitMQ.Client/client/impl/Connection.Heartbeat.cs b/projects/RabbitMQ.Client/client/impl/Connection.Heartbeat.cs
@@ -130,6 +130,13 @@ await FinishCloseAsync(cts.Token)
                     _heartbeatReadTimer?.Change((int)Heartbeat.TotalMilliseconds, Timeout.Infinite);
                 }
             }
+            catch (OperationCanceledException)
+            {
+                if (false == _mainLoopCts.IsCancellationRequested)
+                {
+                    throw;
+                }
+            }
             catch (ObjectDisposedException)
             {
                 // timer is already disposed,

Original file line number	Diff line number	Diff line change
`@@ -130,6 +130,13 @@ await FinishCloseAsync(cts.Token)`
`130`	`130`	`_heartbeatReadTimer?.Change((int)Heartbeat.TotalMilliseconds, Timeout.Infinite);`
`131`	`131`	`}`
`132`	`132`	`}`
	`133`	`+ catch (OperationCanceledException)`
	`134`	`+ {`
	`135`	`+ if (false == _mainLoopCts.IsCancellationRequested)`
	`136`	`+ {`
	`137`	`+ throw;`
	`138`	`+ }`
	`139`	`+ }`
`133`	`140`	`catch (ObjectDisposedException)`
`134`	`141`	`{`
`135`	`142`	`// timer is already disposed,`