dispose service before throw

dotnet · Nov 24, 2020 · 3931f61 · 3931f61
1 parent 9d9c9ae
commit 3931f61
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/.../Microsoft.Extensions.DependencyInjection/src/ServiceLookup/ServiceProviderEngineScope.cs b/.../Microsoft.Extensions.DependencyInjection/src/ServiceLookup/ServiceProviderEngineScope.cs
@@ -53,13 +53,13 @@ internal object CaptureDisposable(object service)
             {
                 if (_disposed)
                 {
-                    if (_disposables != null)
+                    if (service is IDisposable disposable)
                     {
-                        // cleanup disposable just in case still has items before throwing
-                        foreach (IDisposable disposable in _disposables)
-                        {
-                            disposable.Dispose();
-                        }
+                        disposable.Dispose();
+                    }
+                    else
+                    {
+                        ((IAsyncDisposable)service).DisposeAsync().AsTask().Wait();
                     }
                     ThrowHelper.ThrowObjectDisposedException();
                 }