[tomcat] 01/02: Use standard charset rather than (non-standard) name for UTF-8

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit ecf9143103b184bd996d519c4d8e454257b1cd30
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Jun 24 10:11:08 2019 +0100

    Use standard charset rather than (non-standard) name for UTF-8
---
 java/org/apache/catalina/servlets/DefaultServlet.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/java/org/apache/catalina/servlets/DefaultServlet.java 
b/java/org/apache/catalina/servlets/DefaultServlet.java
index c99afe1..d7fde267 100644
--- a/java/org/apache/catalina/servlets/DefaultServlet.java
+++ b/java/org/apache/catalina/servlets/DefaultServlet.java
@@ -1805,7 +1805,7 @@ public class DefaultServlet extends HttpServlet {
             Transformer transformer = tFactory.newTransformer(xsltSource);
 
             ByteArrayOutputStream stream = new ByteArrayOutputStream();
-            OutputStreamWriter osWriter = new OutputStreamWriter(stream, 
"UTF8");
+            OutputStreamWriter osWriter = new OutputStreamWriter(stream, 
StandardCharsets.UTF_8);
             StreamResult out = new StreamResult(osWriter);
             transformer.transform(xmlSource, out);
             osWriter.flush();
@@ -1880,7 +1880,7 @@ public class DefaultServlet extends HttpServlet {
 
         // Prepare a writer to a buffered area
         ByteArrayOutputStream stream = new ByteArrayOutputStream();
-        OutputStreamWriter osWriter = new OutputStreamWriter(stream, "UTF8");
+        OutputStreamWriter osWriter = new OutputStreamWriter(stream, 
StandardCharsets.UTF_8);
         PrintWriter writer = new PrintWriter(osWriter);
 
         StringBuilder sb = new StringBuilder();


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org