From b19059f6cbbe66a07d2d1f58d199f46d5a6f4562 Mon Sep 17 00:00:00 2001
From: rstoyanchev <rossen.stoyanchev@broadcom.com>
Date: Mon, 27 Oct 2025 21:48:33 +0000
Subject: [PATCH] Handle null from JDK HttpResponse#body

Closes gh-35692
---
 .../http/client/reactive/JdkClientHttpResponse.java       | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/spring-web/src/main/java/org/springframework/http/client/reactive/JdkClientHttpResponse.java b/spring-web/src/main/java/org/springframework/http/client/reactive/JdkClientHttpResponse.java
index 6aad4bfb179..d9356350000 100644
--- a/spring-web/src/main/java/org/springframework/http/client/reactive/JdkClientHttpResponse.java
+++ b/spring-web/src/main/java/org/springframework/http/client/reactive/JdkClientHttpResponse.java
@@ -98,7 +98,13 @@ class JdkClientHttpResponse extends AbstractClientHttpResponse {
 	}
 
 	private static Flux<DataBuffer> adaptBody(HttpResponse<Flow.Publisher<List<ByteBuffer>>> response, DataBufferFactory bufferFactory) {
-		return JdkFlowAdapter.flowPublisherToFlux(response.body())
+
+		Flow.Publisher<List<ByteBuffer>> body = response.body();
+		if (body == null) {
+			return Flux.empty();
+		}
+
+		return JdkFlowAdapter.flowPublisherToFlux(body)
 				.flatMapIterable(Function.identity())
 				.map(bufferFactory::wrap)
 				.doOnDiscard(DataBuffer.class, DataBufferUtils::release)