support for async scope in DefaultAutoSubscriberMessageDispatcher (#1723

) follow-up for #1571 Co-authored-by: Wiebe Tijsma <wiebe@tijsma.com>
EasyNetQ · Mar 8, 2024 · 2f1f885 · 2f1f885
1 parent bd1bcf0
commit 2f1f885
Showing 1 changed file with 14 additions and 4 deletions.
diff --git a/Source/EasyNetQ/AutoSubscribe/DefaultAutoSubscriberMessageDispatcher.cs b/Source/EasyNetQ/AutoSubscribe/DefaultAutoSubscriberMessageDispatcher.cs
@@ -27,12 +27,22 @@ public DefaultAutoSubscriberMessageDispatcher() : this(new ActivatorBasedResolve
         where TMessage : class
         where TAsyncConsumer : class, IConsumeAsync<TMessage>
     {
-        using var scope = resolver.CreateScope();
-        var asyncConsumer = scope.Resolve<TAsyncConsumer>();
-        await asyncConsumer.ConsumeAsync(message, cancellationToken).ConfigureAwait(false);
+        var scope = resolver.CreateScope();
+        try
+        {
+            var asyncConsumer = scope.Resolve<TAsyncConsumer>();
+            await asyncConsumer.ConsumeAsync(message, cancellationToken).ConfigureAwait(false);
+        }
+        finally
+        {
+            if (scope is IAsyncDisposable ad)
+                await ad.DisposeAsync().ConfigureAwait(false);
+            else
+                scope.Dispose();
+        }
     }
 
-    private class ActivatorBasedResolver : IServiceResolver
+    private sealed class ActivatorBasedResolver : IServiceResolver
     {
         public TService Resolve<TService>() where TService : class => Activator.CreateInstance<TService>();