Merge pull request #1015 from ricado-group/fixAsyncConsumerSemaphoreDispose

michaelklishin · michaelklishin · commit db63a552b228 · 2021-02-05T07:16:43.000+03:00
Fix Semaphore Disposed Exception in AsyncConsumerWorkService (cherry picked from commit cff0c3d)
diff --git a/projects/RabbitMQ.Client/client/impl/AsyncConsumerWorkService.cs b/projects/RabbitMQ.Client/client/impl/AsyncConsumerWorkService.cs
@@ -128,7 +128,7 @@ private async Task LoopWithConcurrency(CancellationToken cancellationToken)
                 {
                     while (await _channel.Reader.WaitToReadAsync(cancellationToken).ConfigureAwait(false))
                     {
-                        while (_channel.Reader.TryRead(out Work work))
+                        while (_channel.Reader.TryRead(out Work work) && !cancellationToken.IsCancellationRequested)
                         {
                             // Do a quick synchronous check before we resort to async/await with the state-machine overhead.
                             if (!_limiter.Wait(0))

Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,7 @@ private async Task LoopWithConcurrency(CancellationToken cancellationToken)`
`128`	`128`	`{`
`129`	`129`	`while (await _channel.Reader.WaitToReadAsync(cancellationToken).ConfigureAwait(false))`
`130`	`130`	`{`
`131`		`- while (_channel.Reader.TryRead(out Work work))`
	`131`	`+ while (_channel.Reader.TryRead(out Work work) && !cancellationToken.IsCancellationRequested)`
`132`	`132`	`{`
`133`	`133`	`// Do a quick synchronous check before we resort to async/await with the state-machine overhead.`
`134`	`134`	`if (!_limiter.Wait(0))`