From 4df94d8903b8eb49944388df4ef25f424f2a571e Mon Sep 17 00:00:00 2001 From: kkolinko Date: Fri, 8 Apr 2011 01:55:51 +0000 Subject: [PATCH] Do not depend on system encoding settings when running Tomcat tests. git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1090083 13f79535-47bb-0310-9956-ffa450edef68 --- test/org/apache/catalina/startup/SimpleHttpClient.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/test/org/apache/catalina/startup/SimpleHttpClient.java b/test/org/apache/catalina/startup/SimpleHttpClient.java index f4e954529..e0775e8bf 100644 --- a/test/org/apache/catalina/startup/SimpleHttpClient.java +++ b/test/org/apache/catalina/startup/SimpleHttpClient.java @@ -117,14 +117,15 @@ public abstract class SimpleHttpClient { } public void connect(int connectTimeout, int soTimeout) throws UnknownHostException, IOException { + final String encoding = "ISO-8859-1"; SocketAddress addr = new InetSocketAddress("localhost", port); socket = new Socket(); socket.setSoTimeout(soTimeout); socket.connect(addr,connectTimeout); OutputStream os = socket.getOutputStream(); - writer = new OutputStreamWriter(os); + writer = new OutputStreamWriter(os, encoding); InputStream is = socket.getInputStream(); - Reader r = new InputStreamReader(is); + Reader r = new InputStreamReader(is, encoding); reader = new BufferedReader(r); } public void connect() throws UnknownHostException, IOException { -- 2.11.0