From 00399dc1b3bf49c7c79d2258f2d171edba99b50e Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <juergen.hoeller@broadcom.com>
Date: Wed, 18 Jun 2025 12:20:19 +0200
Subject: [PATCH] Reject null for returned CompletableFuture (avoiding
 subsequent NPE)

See gh-34708
---
 .../springframework/cache/interceptor/CacheAspectSupport.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-context/src/main/java/org/springframework/cache/interceptor/CacheAspectSupport.java b/spring-context/src/main/java/org/springframework/cache/interceptor/CacheAspectSupport.java
index c1097f9f726..bb3ae01bdff 100644
--- a/spring-context/src/main/java/org/springframework/cache/interceptor/CacheAspectSupport.java
+++ b/spring-context/src/main/java/org/springframework/cache/interceptor/CacheAspectSupport.java
@@ -463,7 +463,7 @@ public abstract class CacheAspectSupport extends AbstractCacheInvoker
 						() -> {
 							CompletableFuture<?> invokeResult = ((CompletableFuture<?>) invokeOperation(invoker));
 							if (invokeResult == null) {
-								return null;
+								throw new IllegalStateException("Returned CompletableFuture must not be null: " + method);
 							}
 							return invokeResult.exceptionallyCompose(ex -> {
 								invokeFailure.set(true);