From bec0bb0c53a4e2a3cee0c03b3bd274953c93e7ae Mon Sep 17 00:00:00 2001 From: Rossen Stoyanchev Date: Thu, 2 Sep 2021 20:12:41 +0100 Subject: [PATCH] Revert "Add doOnDiscard hook for streaming mode" This reverts commit 77a562dfee04cfb4a76a84257cf33fd73ab6b696. As per findings under https://github.com/reactor/reactor-netty/issues/1746 it looks this wasn't the issue and isn't required. --- .../http/codec/EncoderHttpMessageWriter.java | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/spring-web/src/main/java/org/springframework/http/codec/EncoderHttpMessageWriter.java b/spring-web/src/main/java/org/springframework/http/codec/EncoderHttpMessageWriter.java index cf1d146446..3fe1920773 100644 --- a/spring-web/src/main/java/org/springframework/http/codec/EncoderHttpMessageWriter.java +++ b/spring-web/src/main/java/org/springframework/http/codec/EncoderHttpMessageWriter.java @@ -141,18 +141,16 @@ public class EncoderHttpMessageWriter implements HttpMessageWriter { } if (isStreamingMediaType(contentType)) { - return message - .writeAndFlushWith(body.map(buffer -> { - Hints.touchDataBuffer(buffer, hints, logger); - return Mono.just(buffer).doOnDiscard(PooledDataBuffer.class, DataBufferUtils::release); - })) - .doOnDiscard(PooledDataBuffer.class, DataBufferUtils::release); + return message.writeAndFlushWith(body.map(buffer -> { + Hints.touchDataBuffer(buffer, hints, logger); + return Mono.just(buffer).doOnDiscard(PooledDataBuffer.class, DataBufferUtils::release); + })); } if (logger.isDebugEnabled()) { body = body.doOnNext(buffer -> Hints.touchDataBuffer(buffer, hints, logger)); } - return message.writeWith(body).doOnDiscard(PooledDataBuffer.class, DataBufferUtils::release); + return message.writeWith(body); } @Nullable