* Move code to deal with outstanding confirms on channel shutdown.

Author: lukebakken

projects/RabbitMQ.Client/Impl/Channel.PublisherConfirms.cs

@@ -166,5 +166,31 @@ private void HandleReturn(BasicReturnEventArgs basicReturnEvent)
                 HandleNack(publishSequenceNumber, multiple: false, isReturn: true);
             }
         }
+
+        private async Task MaybeHandlePublisherConfirmationTcsOnChannelShutdownAsync(ShutdownEventArgs reason)
+        {
+            if (_publisherConfirmationsEnabled)
+            {
+                await _confirmSemaphore.WaitAsync(reason.CancellationToken)
+                    .ConfigureAwait(false);
+                try
+                {
+                    if (!_confirmsTaskCompletionSources.IsEmpty)
+                    {
+                        var exception = new AlreadyClosedException(reason);
+                        foreach (TaskCompletionSource<bool> confirmsTaskCompletionSource in _confirmsTaskCompletionSources.Values)
+                        {
+                            confirmsTaskCompletionSource.TrySetException(exception);
+                        }
+
+                        _confirmsTaskCompletionSources.Clear();
+                    }
+                }
+                finally
+                {
+                    _confirmSemaphore.Release();
+                }
+            }
+        }
     }
 }

projects/RabbitMQ.Client/Impl/Channel.cs

@@ -482,31 +482,12 @@ internal Task OnCallbackExceptionAsync(CallbackExceptionEventArgs args)
         private async Task OnChannelShutdownAsync(ShutdownEventArgs reason)
         {
             _continuationQueue.HandleChannelShutdown(reason);
+
             await _channelShutdownAsyncWrapper.InvokeAsync(this, reason)
                 .ConfigureAwait(false);
 
-            if (_publisherConfirmationsEnabled)
-            {
-                await _confirmSemaphore.WaitAsync(reason.CancellationToken)
-                    .ConfigureAwait(false);
-                try
-                {
-                    if (!_confirmsTaskCompletionSources.IsEmpty)
-                    {
-                        var exception = new AlreadyClosedException(reason);
-                        foreach (TaskCompletionSource<bool> confirmsTaskCompletionSource in _confirmsTaskCompletionSources.Values)
-                        {
-                            confirmsTaskCompletionSource.TrySetException(exception);
-                        }
-
-                        _confirmsTaskCompletionSources.Clear();
-                    }
-                }
-                finally
-                {
-                    _confirmSemaphore.Release();
-                }
-            }
+            await MaybeHandlePublisherConfirmationTcsOnChannelShutdownAsync(reason)
+                .ConfigureAwait(false);
 
             _flowControlBlock.Set();
         }