Skip to content

Commit 682c652

Browse files
authored
Merge pull request #89 from prokop7/master
Add synchronized to loaderQueue inside completable future
2 parents f2457ec + b92c94f commit 682c652

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

src/main/java/org/dataloader/DataLoaderHelper.java

+4-2
Original file line numberDiff line numberDiff line change
@@ -311,8 +311,10 @@ private CompletableFuture<V> loadFromCache(K key, Object loadContext, boolean ba
311311
if (getCallEx == null) {
312312
future.complete(cachedValue);
313313
} else {
314-
queueOrInvokeLoader(key, loadContext, batchingEnabled)
315-
.whenComplete(setValueIntoCacheAndCompleteFuture(cacheKey, future));
314+
synchronized (dataLoader) {
315+
queueOrInvokeLoader(key, loadContext, batchingEnabled)
316+
.whenComplete(setValueIntoCacheAndCompleteFuture(cacheKey, future));
317+
}
316318
}
317319
});
318320

0 commit comments

Comments
 (0)