You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ss...@apache.org on 2015/09/04 00:39:08 UTC
svn commit: r1701143 -
/sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/servlet/ResponseBodySupport.java
Author: sseifert
Date: Thu Sep 3 22:39:08 2015
New Revision: 1701143
URL: http://svn.apache.org/r1701143
Log:
SLING-4998 ResponseBodySupport - use default charset if no response charset is set
Modified:
sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/servlet/ResponseBodySupport.java
Modified: sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/servlet/ResponseBodySupport.java
URL: http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/servlet/ResponseBodySupport.java?rev=1701143&r1=1701142&r2=1701143&view=diff
==============================================================================
--- sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/servlet/ResponseBodySupport.java (original)
+++ sling/trunk/testing/mocks/sling-mock/src/main/java/org/apache/sling/testing/mock/sling/servlet/ResponseBodySupport.java Thu Sep 3 22:39:08 2015
@@ -26,6 +26,9 @@ import java.io.UnsupportedEncodingExcept
import javax.servlet.ServletOutputStream;
+import org.apache.commons.lang3.CharEncoding;
+import org.apache.commons.lang3.StringUtils;
+
/**
* Manage response body content.
*/
@@ -60,9 +63,9 @@ class ResponseBodySupport {
public PrintWriter getWriter(String charset) {
if (printWriter == null) {
try {
- printWriter = new PrintWriter(new OutputStreamWriter(getOutputStream(), charset));
+ printWriter = new PrintWriter(new OutputStreamWriter(getOutputStream(), defaultCharset(charset)));
} catch (UnsupportedEncodingException ex) {
- throw new RuntimeException("Unsupported encoding: " + charset, ex);
+ throw new RuntimeException("Unsupported encoding: " + defaultCharset(charset), ex);
}
}
return printWriter;
@@ -84,10 +87,14 @@ class ResponseBodySupport {
printWriter.flush();
}
try {
- return new String(getOutput(), charset);
+ return new String(getOutput(), defaultCharset(charset));
} catch (UnsupportedEncodingException ex) {
- throw new RuntimeException("Unsupported encoding: " + charset, ex);
+ throw new RuntimeException("Unsupported encoding: " + defaultCharset(charset), ex);
}
}
+
+ private String defaultCharset(String charset) {
+ return StringUtils.defaultString(charset, CharEncoding.UTF_8);
+ }
}