From bf8d99d7e45956a3e2133d7c23d78f3dbfe2596f Mon Sep 17 00:00:00 2001
From: Alex Antonov <alex@antonov.ws>
Date: Thu, 4 Dec 2014 16:46:15 -0600
Subject: [PATCH] Fixed the output stream incomplete data by explicitly
 flushing the OutputStreamWriter

---
 .../protobuf/ProtobufHttpMessageConverter.java   | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/spring-web/src/main/java/org/springframework/http/converter/protobuf/ProtobufHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/protobuf/ProtobufHttpMessageConverter.java
index 54d35913339..281d00a761b 100644
--- a/spring-web/src/main/java/org/springframework/http/converter/protobuf/ProtobufHttpMessageConverter.java
+++ b/spring-web/src/main/java/org/springframework/http/converter/protobuf/ProtobufHttpMessageConverter.java
@@ -166,16 +166,24 @@ public class ProtobufHttpMessageConverter extends AbstractHttpMessageConverter<M
 		Charset charset = getCharset(contentType);
 
 		if (MediaType.TEXT_HTML.isCompatibleWith(contentType)) {
-			HtmlFormat.print(message, new OutputStreamWriter(outputMessage.getBody(), charset));
+			final OutputStreamWriter outputStreamWriter = new OutputStreamWriter(outputMessage.getBody(), charset);
+			HtmlFormat.print(message, outputStreamWriter);
+			outputStreamWriter.flush();
 		}
 		else if (MediaType.APPLICATION_JSON.isCompatibleWith(contentType)) {
-			JsonFormat.print(message, new OutputStreamWriter(outputMessage.getBody(), charset));
+			final OutputStreamWriter outputStreamWriter = new OutputStreamWriter(outputMessage.getBody(), charset);
+			JsonFormat.print(message, outputStreamWriter);
+			outputStreamWriter.flush();
 		}
 		else if (MediaType.TEXT_PLAIN.isCompatibleWith(contentType)) {
-			TextFormat.print(message, new OutputStreamWriter(outputMessage.getBody(), charset));
+			final OutputStreamWriter outputStreamWriter = new OutputStreamWriter(outputMessage.getBody(), charset);
+			TextFormat.print(message, outputStreamWriter);
+			outputStreamWriter.flush();
 		}
 		else if (MediaType.APPLICATION_XML.isCompatibleWith(contentType)) {
-			XmlFormat.print(message, new OutputStreamWriter(outputMessage.getBody(), charset));
+			final OutputStreamWriter outputStreamWriter = new OutputStreamWriter(outputMessage.getBody(), charset);
+			XmlFormat.print(message, outputStreamWriter);
+			outputStreamWriter.flush();
 		}
 		else if (PROTOBUF.isCompatibleWith(contentType)) {
 			setProtoHeader(outputMessage, message);