From 631f5545cdc684a9b4027e8fd1c22ce695f901e3 Mon Sep 17 00:00:00 2001 From: markt Date: Tue, 28 Jun 2011 16:06:32 +0000 Subject: [PATCH] =?utf8?q?More=20https://issues.apache.org/bugzilla/show?= =?utf8?q?=5Fbug.cgi=3Fid=3D51400=20related=20changes=20Based=20on=20a=20p?= =?utf8?q?atch=20by=20Konstantin=20Prei=C3=9Fer?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1140699 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/tomcat/util/buf/C2BConverter.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/java/org/apache/tomcat/util/buf/C2BConverter.java b/java/org/apache/tomcat/util/buf/C2BConverter.java index d75c6b1cb..ab4ef1bde 100644 --- 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; } -- 2.11.0