Make sure corresponding Connection and Channel token properly float into handlers

danielmarbach · danielmarbach · commit 2368cfa062d5 · 2024-12-08T10:00:51.000+01:00
diff --git a/projects/RabbitMQ.Client/Impl/Channel.cs b/projects/RabbitMQ.Client/Impl/Channel.cs
@@ -196,7 +196,7 @@ protected void TakeOver(Channel other)
         public Task CloseAsync(ushort replyCode, string replyText, bool abort,
             CancellationToken cancellationToken)
         {
-            var args = new ShutdownEventArgs(ShutdownInitiator.Application, replyCode, replyText);
+            var args = new ShutdownEventArgs(ShutdownInitiator.Application, replyCode, replyText, cancellationToken: cancellationToken);
             return CloseAsync(args, abort, cancellationToken);
         }
 
diff --git a/projects/RabbitMQ.Client/Impl/Connection.cs b/projects/RabbitMQ.Client/Impl/Connection.cs
@@ -297,7 +297,7 @@ internal void EnsureIsOpen()
         public Task CloseAsync(ushort reasonCode, string reasonText, TimeSpan timeout, bool abort,
             CancellationToken cancellationToken = default)
         {
-            var reason = new ShutdownEventArgs(ShutdownInitiator.Application, reasonCode, reasonText);
+            var reason = new ShutdownEventArgs(ShutdownInitiator.Application, reasonCode, reasonText, cancellationToken: cancellationToken);
             return CloseAsync(reason, abort, timeout, cancellationToken);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -196,7 +196,7 @@ protected void TakeOver(Channel other)`
`196`	`196`	`public Task CloseAsync(ushort replyCode, string replyText, bool abort,`
`197`	`197`	`CancellationToken cancellationToken)`
`198`	`198`	`{`
`199`		`- var args = new ShutdownEventArgs(ShutdownInitiator.Application, replyCode, replyText);`
	`199`	`+ var args = new ShutdownEventArgs(ShutdownInitiator.Application, replyCode, replyText, cancellationToken: cancellationToken);`
`200`	`200`	`return CloseAsync(args, abort, cancellationToken);`
`201`	`201`	`}`
`202`	`202`
Original file line number	Diff line number	Diff line change
`@@ -297,7 +297,7 @@ internal void EnsureIsOpen()`
`297`	`297`	`public Task CloseAsync(ushort reasonCode, string reasonText, TimeSpan timeout, bool abort,`
`298`	`298`	`CancellationToken cancellationToken = default)`
`299`	`299`	`{`
`300`		`- var reason = new ShutdownEventArgs(ShutdownInitiator.Application, reasonCode, reasonText);`
	`300`	`+ var reason = new ShutdownEventArgs(ShutdownInitiator.Application, reasonCode, reasonText, cancellationToken: cancellationToken);`
`301`	`301`	`return CloseAsync(reason, abort, timeout, cancellationToken);`
`302`	`302`	`}`
`303`	`303`