More https://issues.apache.org/bugzilla/show_bug.cgi?id=51400 related changes

Based on a patch by Konstantin Preißer

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1140699 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/tomcat/util/buf/C2BConverter.java b/java/org/apache/tomcat/util/buf/C2BConverter.java
index d75c6b1..ab4ef1b 100644 (file)
--- a/java/org/apache/tomcat/util/buf/C2BConverter.java
+++ b/java/org/apache/tomcat/util/buf/C2BConverter.java
@@ -20,7 +20,7 @@ package org.apache.tomcat.util.buf;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
-import java.io.UnsupportedEncodingException;
+import java.nio.charset.Charset;
 
 /** Efficient conversion of character to bytes.
  *  
@@ -44,7 +44,7 @@ public final class C2BConverter {
     public C2BConverter(ByteChunk output, String encoding) throws IOException {
         this.bb=output;
         ios=new IntermediateOutputStream( output );
-        conv=new WriteConvertor( ios, encoding );
+        conv=new WriteConvertor( ios, B2CConverter.getCharset(encoding));
         this.enc=encoding;
     }
 
@@ -168,10 +168,8 @@ public final class C2BConverter {
     
     /** Create a converter.
      */
-    public WriteConvertor( IntermediateOutputStream out, String enc )
-        throws UnsupportedEncodingException
-    {
-        super( out, enc );
+    public WriteConvertor(IntermediateOutputStream out, Charset charset) {
+        super(out, charset);
         ios=out;
     }