Browse Source

Merge branch '6.2.x'

pull/35473/head
rstoyanchev 2 months ago
parent
commit
f07873c966
  1. 7
      spring-web/src/main/java/org/springframework/http/client/reactive/JdkClientHttpResponse.java

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

@ -67,7 +67,12 @@ class JdkClientHttpResponse extends AbstractClientHttpResponse { @@ -67,7 +67,12 @@ 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)

Loading…
Cancel
Save