* Better cancellation token handling in CloseAsync

Author: lukebakken

projects/RabbitMQ.Client/Impl/Channel.cs

@@ -208,9 +208,8 @@ public Task CloseAsync(ushort replyCode, string replyText, bool abort,
         public async Task CloseAsync(ShutdownEventArgs args, bool abort,
             CancellationToken cancellationToken)
         {
-            CancellationToken originalCancellationToken = cancellationToken;
-            bool cancellationRequested = cancellationToken.IsCancellationRequested;
-            if (IsOpen && cancellationRequested)
+            CancellationToken argCancellationToken = cancellationToken;
+            if (IsOpen)
             {
                 // Note: we really do need to try and close this channel!
                 cancellationToken = CancellationToken.None;
@@ -267,7 +266,7 @@ await ConsumerDispatcher.WaitForShutdownAsync()
                 MaybeDisposeContinuation(enqueued, k);
                 _rpcSemaphore.Release();
                 ChannelShutdownAsync -= k.OnConnectionShutdownAsync;
-                originalCancellationToken.ThrowIfCancellationRequested();
+                argCancellationToken.ThrowIfCancellationRequested();
             }
         }
 

projects/RabbitMQ.Client/Impl/Connection.cs

@@ -320,6 +320,8 @@ public Task CloseAsync(ushort reasonCode, string reasonText, TimeSpan timeout, b
         ///</remarks>
         internal async Task CloseAsync(ShutdownEventArgs reason, bool abort, TimeSpan timeout, CancellationToken cancellationToken)
         {
+            CancellationToken argCancellationToken = cancellationToken;
+
             if (timeout < InternalConstants.DefaultConnectionAbortTimeout)
             {
                 timeout = InternalConstants.DefaultConnectionAbortTimeout;
@@ -424,6 +426,8 @@ await _frameHandler.CloseAsync(cts.Token)
                     throw;
                 }
             }
+
+            argCancellationToken.ThrowIfCancellationRequested();
         }
 
         internal async Task ClosedViaPeerAsync(ShutdownEventArgs reason, CancellationToken cancellationToken)