When AsyncCacheLoader.asyncLoadAll returns excess keys, wait for al…

…l keys to be added to the cache before returning requested keys Fixes #1409.
ben-manes · Feb 24, 2024 · e5e9bc3 · e5e9bc3
1 parent c4b8dd7
commit e5e9bc3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/caffeine/src/main/java/com/github/benmanes/caffeine/cache/LocalAsyncCache.java b/caffeine/src/main/java/com/github/benmanes/caffeine/cache/LocalAsyncCache.java
@@ -144,8 +144,7 @@ default CompletableFuture<Map<K, V>> getAll(Iterable<? extends K> keys,
     try {
       var loader = mappingFunction.apply(
           Collections.unmodifiableSet(proxies.keySet()), cache().executor());
-      loader.whenComplete(completer);
-      return composeResult(futures);
+      return loader.whenComplete(completer).thenCompose(ignored -> composeResult(futures));
     } catch (Throwable t) {
       completer.accept(/* result */ null, t);
       throw t;

diff --git a/caffeine/src/test/java/com/github/benmanes/caffeine/cache/AsyncLoadingCacheTest.java b/caffeine/src/test/java/com/github/benmanes/caffeine/cache/AsyncLoadingCacheTest.java
@@ -319,7 +319,8 @@ public void getAll_present_partial(AsyncLoadingCache<Int, Int> cache, CacheConte
 
   @Test(dataProvider = "caches")
   @CacheSpec(loader = Loader.BULK_NEGATIVE_EXCEEDS,
-      removalListener = { Listener.DISABLED, Listener.REJECTING })
+      removalListener = { Listener.DISABLED, Listener.REJECTING },
+      executor = { CacheExecutor.DIRECT, CacheExecutor.DEFAULT })
   public void getAll_exceeds(AsyncLoadingCache<Int, Int> cache, CacheContext context) {
     var result = cache.getAll(context.absentKeys()).join();