This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-servlet-helpers.git
commit 63410fd5784d38866b2d558be28ee25b889648b4 Author: Stefan Seifert <[email protected]> AuthorDate: Thu Jun 15 19:52:54 2017 +0000 SLING-6948 HttpServletResponse.getOutput() and getOutputAsString() return different information git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1798871 13f79535-47bb-0310-9956-ffa450edef68 --- .../java/org/apache/sling/servlethelpers/ResponseBodySupport.java | 6 +++--- .../sling/servlethelpers/MockSlingHttpServletResponseTest.java | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/apache/sling/servlethelpers/ResponseBodySupport.java b/src/main/java/org/apache/sling/servlethelpers/ResponseBodySupport.java index 2a0aaac..e40bdfe 100644 --- a/src/main/java/org/apache/sling/servlethelpers/ResponseBodySupport.java +++ b/src/main/java/org/apache/sling/servlethelpers/ResponseBodySupport.java @@ -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) { diff --git a/src/test/java/org/apache/sling/servlethelpers/MockSlingHttpServletResponseTest.java b/src/test/java/org/apache/sling/servlethelpers/MockSlingHttpServletResponseTest.java index 3f72e15..abbfa6a 100644 --- a/src/test/java/org/apache/sling/servlethelpers/MockSlingHttpServletResponseTest.java +++ b/src/test/java/org/apache/sling/servlethelpers/MockSlingHttpServletResponseTest.java @@ -133,6 +133,8 @@ public class MockSlingHttpServletResponseTest { 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(); -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
