Merge branch '6.2.x'

Author: rstoyanchev

spring-web/src/main/java/org/springframework/http/client/reactive/JdkClientHttpResponse.java

@@ -67,7 +67,12 @@ private static HttpHeaders adaptHeaders(HttpResponse<Flow.Publisher<List<ByteBuf
 	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)