svn commit: r1798871 - in /sling/trunk/bundles/extensions/servlet-helpers/src: main/java/org/apache/sling/servlethelpers/ResponseBodySupport.java test/java/org/apache/sling/servlethelpers/MockSlingHttpServletResponseTest.java

[sseifert]

Author: sseifert
Date: Thu Jun 15 19:52:54 2017
New Revision: 1798871

URL: http://svn.apache.org/viewvc?rev=1798871&view=rev
Log:
SLING-6948 HttpServletResponse.getOutput() and getOutputAsString() return 
different information

Modified:
    
sling/trunk/bundles/extensions/servlet-helpers/src/main/java/org/apache/sling/servlethelpers/ResponseBodySupport.java
    
sling/trunk/bundles/extensions/servlet-helpers/src/test/java/org/apache/sling/servlethelpers/MockSlingHttpServletResponseTest.java

Modified: 
sling/trunk/bundles/extensions/servlet-helpers/src/main/java/org/apache/sling/servlethelpers/ResponseBodySupport.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/servlet-helpers/src/main/java/org/apache/sling/servlethelpers/ResponseBodySupport.java?rev=1798871&r1=1798870&r2=1798871&view=diff
==============================================================================
--- 
sling/trunk/bundles/extensions/servlet-helpers/src/main/java/org/apache/sling/servlethelpers/ResponseBodySupport.java
 (original)
+++ 
sling/trunk/bundles/extensions/servlet-helpers/src/main/java/org/apache/sling/servlethelpers/ResponseBodySupport.java
 Thu Jun 15 19:52:54 2017
@@ -81,6 +81,9 @@ class ResponseBodySupport {
     }
 
     public byte[] getOutput() {
+        if (printWriter != null) {
+            printWriter.flush();
+        }
         if (servletOutputStream != null) {
             try {
                 servletOutputStream.flush();
@@ -92,9 +95,6 @@ class ResponseBodySupport {
     }
 
     public String getOutputAsString(String charset) {
-        if (printWriter != null) {
-            printWriter.flush();
-        }
         try {
             return new String(getOutput(), defaultCharset(charset));
         } catch (UnsupportedEncodingException ex) {

Modified: 
sling/trunk/bundles/extensions/servlet-helpers/src/test/java/org/apache/sling/servlethelpers/MockSlingHttpServletResponseTest.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/servlet-helpers/src/test/java/org/apache/sling/servlethelpers/MockSlingHttpServletResponseTest.java?rev=1798871&r1=1798870&r2=1798871&view=diff
==============================================================================
--- 
sling/trunk/bundles/extensions/servlet-helpers/src/test/java/org/apache/sling/servlethelpers/MockSlingHttpServletResponseTest.java
 (original)
+++ 
sling/trunk/bundles/extensions/servlet-helpers/src/test/java/org/apache/sling/servlethelpers/MockSlingHttpServletResponseTest.java
 Thu Jun 15 19:52:54 2017
@@ -133,6 +133,8 @@ public class MockSlingHttpServletRespons
         final String TEST_CONTENT = "Der Jodelkaiser äöü߀ ᚠᛇᚻ";
         response.setCharacterEncoding(CharEncoding.UTF_8);
         response.getWriter().write(TEST_CONTENT);
+
+        assertEquals(TEST_CONTENT, new String(response.getOutput(), 
CharEncoding.UTF_8));
         assertEquals(TEST_CONTENT, response.getOutputAsString());
 
         response.resetBuffer();