Add doOnDiscard hook for streaming mode

Potential fix for issue reported at reactor/reactor-netty#1746
spring-projects · Aug 12, 2021 · 77a562d · 77a562d
1 parent 7b80f4f
commit 77a562d
Showing 1 changed file with 7 additions and 5 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
@@ -141,16 +141,18 @@ public Mono<Void> write(Publisher<? extends T> inputStream, ResolvableType eleme
 		}
 
 		if (isStreamingMediaType(contentType)) {
-			return message.writeAndFlushWith(body.map(buffer -> {
-				Hints.touchDataBuffer(buffer, hints, logger);
-				return Mono.just(buffer).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);
+					}))
+					.doOnDiscard(PooledDataBuffer.class, DataBufferUtils::release);
 		}
 
 		if (logger.isDebugEnabled()) {
 			body = body.doOnNext(buffer -> Hints.touchDataBuffer(buffer, hints, logger));
 		}
-		return message.writeWith(body);
+		return message.writeWith(body).doOnDiscard(PooledDataBuffer.class, DataBufferUtils::release);
 	}
 
 	@Nullable