Dispose once (#84)

* Dispose only once

* update

Author: Shane32

src/GraphQL.AspNetCore3/GraphQLHttpMiddleware.cs

@@ -571,15 +571,13 @@ protected virtual async Task HandleBatchRequestAsync(
     protected virtual async Task<ExecutionResult> ExecuteScopedRequestAsync(HttpContext context, GraphQLRequest? request, IDictionary<string, object?> userContext)
     {
         var scope = _serviceScopeFactory.CreateScope();
-        if (scope is IAsyncDisposable ad) {
-            try {
-                return await ExecuteRequestAsync(context, request, scope.ServiceProvider, userContext);
-            } finally {
-                await ad.DisposeAsync().ConfigureAwait(false);
-            }
-        } else {
-            using (scope)
-                return await ExecuteRequestAsync(context, request, scope.ServiceProvider, userContext);
+        try {
+            return await ExecuteRequestAsync(context, request, scope.ServiceProvider, userContext);
+        } finally {
+            if (scope is IAsyncDisposable ad)
+                await ad.DisposeAsync();
+            else
+                scope.Dispose();
         }
     }
 

src/GraphQL.AspNetCore3/WebSockets/GraphQLWs/SubscriptionServer.cs

@@ -283,7 +283,7 @@ protected override async Task<ExecutionResult> ExecuteRequestAsync(OperationMess
         var request = Serializer.ReadNode<GraphQLRequest>(message.Payload)
             ?? throw new ArgumentNullException(nameof(message) + "." + nameof(OperationMessage.Payload));
 #pragma warning restore CA2208 // Instantiate argument exceptions correctly
-        using var scope = ServiceScopeFactory.CreateScope();
+        var scope = ServiceScopeFactory.CreateScope();
         try {
             var options = new ExecutionOptions {
                 Query = request.Query,
@@ -301,6 +301,8 @@ protected override async Task<ExecutionResult> ExecuteRequestAsync(OperationMess
         } finally {
             if (scope is IAsyncDisposable ad)
                 await ad.DisposeAsync();
+            else
+                scope.Dispose();
         }
     }
 

src/GraphQL.AspNetCore3/WebSockets/SubscriptionsTransportWs/SubscriptionServer.cs

@@ -190,7 +190,7 @@ protected override async Task<ExecutionResult> ExecuteRequestAsync(OperationMess
         var request = Serializer.ReadNode<GraphQLRequest>(message.Payload)
             ?? throw new ArgumentNullException(nameof(message) + "." + nameof(OperationMessage.Payload));
 #pragma warning restore CA2208 // Instantiate argument exceptions correctly
-        using var scope = ServiceScopeFactory.CreateScope();
+        var scope = ServiceScopeFactory.CreateScope();
         try {
             var options = new ExecutionOptions {
                 Query = request.Query,
@@ -208,6 +208,8 @@ protected override async Task<ExecutionResult> ExecuteRequestAsync(OperationMess
         } finally {
             if (scope is IAsyncDisposable ad)
                 await ad.DisposeAsync();
+            else
+                scope.Dispose();
         }
     }