feat : handle thread safe issue for getCurrentFutures(#1843) (#1844)

cherry pick #1843
ExpediaGroup · Sep 14, 2023 · 194328a · 194328a
1 parent 13c91fb
commit 194328a
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/...ataloader/src/main/kotlin/com/expediagroup/graphql/dataloader/KotlinDataLoaderRegistry.kt b/...ataloader/src/main/kotlin/com/expediagroup/graphql/dataloader/KotlinDataLoaderRegistry.kt
@@ -61,11 +61,11 @@ class KotlinDataLoaderRegistry(
      * @return list of current completable futures.
      */
     fun getCurrentFutures(): List<CompletableFuture<*>> =
-        synchronized(registry.dataLoaders) {
-            registry.dataLoaders.map { dataLoader ->
-                dataLoader.cacheMap.all
-            }.flatten()
-        }
+        registry.dataLoaders.map { dataLoader ->
+            synchronized(dataLoader) {
+                dataLoader.cacheMap.all.toList()
+            }
+        }.flatten()
 
     /**
      * This will invoke [DataLoader.dispatch] on each of the registered [DataLoader]s,