Author: sseifert Date: Thu Jun 15 19:53:58 2017 New Revision: 1798872 URL: http://svn.apache.org/viewvc?rev=1798872&view=rev Log: SLING-6948 HttpServletResponse.getOutput() and getOutputAsString() return different information
Modified: sling/branches/testing/mocks/servlet-helpers-1.0.x/src/main/java/org/apache/sling/servlethelpers/ResponseBodySupport.java sling/branches/testing/mocks/servlet-helpers-1.0.x/src/test/java/org/apache/sling/servlethelpers/MockSlingHttpServletResponseTest.java Modified: sling/branches/testing/mocks/servlet-helpers-1.0.x/src/main/java/org/apache/sling/servlethelpers/ResponseBodySupport.java URL: http://svn.apache.org/viewvc/sling/branches/testing/mocks/servlet-helpers-1.0.x/src/main/java/org/apache/sling/servlethelpers/ResponseBodySupport.java?rev=1798872&r1=1798871&r2=1798872&view=diff ============================================================================== --- sling/branches/testing/mocks/servlet-helpers-1.0.x/src/main/java/org/apache/sling/servlethelpers/ResponseBodySupport.java (original) +++ sling/branches/testing/mocks/servlet-helpers-1.0.x/src/main/java/org/apache/sling/servlethelpers/ResponseBodySupport.java Thu Jun 15 19:53:58 2017 @@ -72,6 +72,9 @@ class ResponseBodySupport { } public byte[] getOutput() { + if (printWriter != null) { + printWriter.flush(); + } if (servletOutputStream != null) { try { servletOutputStream.flush(); @@ -83,9 +86,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/branches/testing/mocks/servlet-helpers-1.0.x/src/test/java/org/apache/sling/servlethelpers/MockSlingHttpServletResponseTest.java URL: http://svn.apache.org/viewvc/sling/branches/testing/mocks/servlet-helpers-1.0.x/src/test/java/org/apache/sling/servlethelpers/MockSlingHttpServletResponseTest.java?rev=1798872&r1=1798871&r2=1798872&view=diff ============================================================================== --- sling/branches/testing/mocks/servlet-helpers-1.0.x/src/test/java/org/apache/sling/servlethelpers/MockSlingHttpServletResponseTest.java (original) +++ sling/branches/testing/mocks/servlet-helpers-1.0.x/src/test/java/org/apache/sling/servlethelpers/MockSlingHttpServletResponseTest.java Thu Jun 15 19:53:58 2017 @@ -134,6 +134,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();