diff --git a/executions/graphql-kotlin-dataloader/src/main/kotlin/com/expediagroup/graphql/dataloader/KotlinDataLoaderRegistry.kt b/executions/graphql-kotlin-dataloader/src/main/kotlin/com/expediagroup/graphql/dataloader/KotlinDataLoaderRegistry.kt index 1d28bdfcf1..42ce4df4bc 100644 --- a/executions/graphql-kotlin-dataloader/src/main/kotlin/com/expediagroup/graphql/dataloader/KotlinDataLoaderRegistry.kt +++ b/executions/graphql-kotlin-dataloader/src/main/kotlin/com/expediagroup/graphql/dataloader/KotlinDataLoaderRegistry.kt @@ -61,11 +61,11 @@ class KotlinDataLoaderRegistry( * @return list of current completable futures. */ fun getCurrentFutures(): List> = - 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,