Added missing await #352

ChilliCream · Jan 8, 2019 · 18e768f · 18e768f
1 parent 70b8d94
commit 18e768f
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/src/Core/Core/Execution/QueryExecuter.cs b/src/Core/Core/Execution/QueryExecuter.cs
@@ -44,6 +44,13 @@ public Task<IExecutionResult> ExecuteAsync(
                 throw new ArgumentNullException(nameof(request));
             }
 
+            return ExecuteInternalAsync(request, cancellationToken);
+        }
+
+        private async Task<IExecutionResult> ExecuteInternalAsync(
+            QueryRequest request,
+            CancellationToken cancellationToken)
+        {
             IServiceProvider services = (request.Services == null)
                 ? _applicationServices.Include(Schema.Services)
                 : _applicationServices.Include(request.Services);
@@ -55,14 +62,15 @@ public Task<IExecutionResult> ExecuteAsync(
                     scope.ServiceProvider,
                     request.ToReadOnly());
 
-                return ExecuteMiddlewareAsync(context);
+                return await ExecuteMiddlewareAsync(context)
+                    .ConfigureAwait(false);
             }
         }
 
         private async Task<IExecutionResult> ExecuteMiddlewareAsync(
             IQueryContext context)
         {
-            await _queryDelegate(context);
+            await _queryDelegate(context).ConfigureAwait(false);
 
             if (context.Result == null)
             {