Fix DataLoader concurrent issues

Fixes #9651
OrchardCMS · Jun 24, 2021 · ea0d3a1 · ea0d3a1
1 parent f3bf8d5
commit ea0d3a1
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/OrchardCore/OrchardCore.Apis.GraphQL.Abstractions/Extensions/DataLoaderExtensions.cs b/src/OrchardCore/OrchardCore.Apis.GraphQL.Abstractions/Extensions/DataLoaderExtensions.cs
@@ -7,16 +7,16 @@ namespace OrchardCore.Apis.GraphQL
 {
     public static class DataLoaderExtensions
     {
-        public static Task<T[]> LoadAsync<TKey, T>(this IDataLoader<TKey, T> dataLoader, IEnumerable<TKey> keys)
+        public static async Task<T[]> LoadAsync<TKey, T>(this IDataLoader<TKey, T> dataLoader, IEnumerable<TKey> keys)
         {
-            var tasks = new List<Task<T>>();
+            var items = new List<T>();
 
             foreach (var key in keys)
             {
-                tasks.Add(dataLoader.LoadAsync(key));
+                items.Add(await dataLoader.LoadAsync(key));
             }
 
-            return Task.WhenAll(tasks);
+            return items.ToArray();
         }
 
         public static Task<T[]> LoadAsync<TKey, T>(this IDataLoader<TKey, T> dataLoader, params TKey[] keys)