From e68bf010dad4067e9a72d6ffa9502047b44f53ee Mon Sep 17 00:00:00 2001
From: Arjen Poutsma <apoutsma@pivotal.io>
Date: Fri, 26 Oct 2018 11:36:05 +0200
Subject: [PATCH] Fix memory leak for ServerSentEventHttpMessageWriter

Issue: SPR-17419
---
 .../http/codec/ServerSentEventHttpMessageWriter.java         | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/spring-web/src/main/java/org/springframework/http/codec/ServerSentEventHttpMessageWriter.java b/spring-web/src/main/java/org/springframework/http/codec/ServerSentEventHttpMessageWriter.java
index fba05c19414..18814135ae1 100644
--- a/spring-web/src/main/java/org/springframework/http/codec/ServerSentEventHttpMessageWriter.java
+++ b/spring-web/src/main/java/org/springframework/http/codec/ServerSentEventHttpMessageWriter.java
@@ -32,6 +32,8 @@ import org.springframework.core.codec.Encoder;
 import org.springframework.core.codec.Hints;
 import org.springframework.core.io.buffer.DataBuffer;
 import org.springframework.core.io.buffer.DataBufferFactory;
+import org.springframework.core.io.buffer.DataBufferUtils;
+import org.springframework.core.io.buffer.PooledDataBuffer;
 import org.springframework.http.MediaType;
 import org.springframework.http.ReactiveHttpOutputMessage;
 import org.springframework.http.server.reactive.ServerHttpRequest;
@@ -144,7 +146,8 @@ public class ServerSentEventHttpMessageWriter implements HttpMessageWriter<Objec
 
 			return Flux.concat(encodeText(sb, mediaType, factory),
 					encodeData(data, valueType, mediaType, factory, hints),
-					encodeText("\n", mediaType, factory));
+					encodeText("\n", mediaType, factory))
+					.doOnDiscard(PooledDataBuffer.class, DataBufferUtils::release);
 		});
 	}