Merge pull request #1160 from rabbitmq/rabbitmq-dotnet-client-1154-7.x

lukebakken · web-flow · commit 1f46e49b5bad · 2022-02-24T09:57:25.000-08:00
Merge pull request #1154 from ricado-group/1153-semaphore-disposed-ex…
diff --git a/projects/RabbitMQ.Client/client/impl/AsyncConsumerWorkService.cs b/projects/RabbitMQ.Client/client/impl/AsyncConsumerWorkService.cs
@@ -178,7 +178,14 @@ private static async Task HandleConcurrent(Work work, IModel model, SemaphoreSli
                 finally
                 {
                     work.PostExecute();
-                    limiter.Release();
+
+                    try
+                    {
+                        limiter.Release();
+                    }
+                    catch (ObjectDisposedException) // Prevents Exceptions in the Task's finalizer when the WorkPool is Stopped
+                    {
+                    }
                 }
             }
 

Original file line number	Diff line number	Diff line change
`@@ -178,7 +178,14 @@ private static async Task HandleConcurrent(Work work, IModel model, SemaphoreSli`
`178`	`178`	`finally`
`179`	`179`	`{`
`180`	`180`	`work.PostExecute();`
`181`		`- limiter.Release();`
	`181`	`+`
	`182`	`+ try`
	`183`	`+ {`
	`184`	`+ limiter.Release();`
	`185`	`+ }`
	`186`	`+ catch (ObjectDisposedException) // Prevents Exceptions in the Task's finalizer when the WorkPool is Stopped`
	`187`	`+ {`
	`188`	`+ }`
`182`	`189`	`}`
`183`	`190`	`}`
`184`	`191`