Index: java/org/apache/commons/httpclient/HttpConnection.java =================================================================== RCS file: /home/cvspublic/jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/HttpConnection.java,v retrieving revision 1.85 diff -u -r1.85 HttpConnection.java --- java/org/apache/commons/httpclient/HttpConnection.java 22 Feb 2004 18:08:45 -0000 1.85 +++ java/org/apache/commons/httpclient/HttpConnection.java 8 Apr 2004 19:13:03 -0000 @@ -796,7 +796,7 @@ LOG.trace("enter HttpConnection.getRequestOutputStream()"); assertOpen(); OutputStream out = this.outputStream; - if (Wire.enabled()) { + if (Wire.debugEnabled()) { out = new WireLogOutputStream(out); } return out; Index: java/org/apache/commons/httpclient/HttpMethodBase.java =================================================================== RCS file: /home/cvspublic/jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/HttpMethodBase.java,v retrieving revision 1.202 diff -u -r1.202 HttpMethodBase.java --- java/org/apache/commons/httpclient/HttpMethodBase.java 25 Mar 2004 20:37:19 -0000 1.202 +++ java/org/apache/commons/httpclient/HttpMethodBase.java 8 Apr 2004 19:13:09 -0000 @@ -1,5 +1,5 @@ /* - * $Header: /home/cvspublic/jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/HttpMethodBase.java,v 1.202 2004/03/25 20:37:19 olegk Exp $ + * $Header: /home/cvs/jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/HttpMethodBase.java,v 1.202 2004/03/25 20:37:19 olegk Exp $ * $Revision: 1.202 $ * $Date: 2004/03/25 20:37:19 $ * @@ -1595,7 +1595,7 @@ responseBody = null; // is this desired? InputStream is = conn.getResponseInputStream(); - if (Wire.enabled()) { + if (Wire.debugEnabled()) { is = new WireLogInputStream(is); } InputStream result = null; Index: java/org/apache/commons/httpclient/Wire.java =================================================================== RCS file: /home/cvspublic/jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/Wire.java,v retrieving revision 1.6 diff -u -r1.6 Wire.java --- java/org/apache/commons/httpclient/Wire.java 22 Feb 2004 18:08:46 -0000 1.6 +++ java/org/apache/commons/httpclient/Wire.java 8 Apr 2004 19:13:10 -0000 @@ -1,5 +1,5 @@ /* - * $Header: /home/cvspublic/jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/Wire.java,v 1.6 2004/02/22 18:08:46 olegk Exp $ + * $Header: /home/cvs/jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/Wire.java,v 1.6 2004/02/22 18:08:46 olegk Exp $ * $Revision: 1.6 $ * $Date: 2004/02/22 18:08:46 $ * @@ -34,9 +34,6 @@ import java.io.IOException; import java.io.InputStream; import java.io.ByteArrayInputStream; -import java.io.Reader; -import java.io.InputStreamReader; -import java.io.UnsupportedEncodingException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -55,22 +52,16 @@ private static void wire(String header, InputStream instream) throws IOException { - Reader reader = null; - try { - reader = new InputStreamReader(instream, "US-ASCII"); - } catch (UnsupportedEncodingException e) { - reader = new InputStreamReader(instream); - } StringBuffer buffer = new StringBuffer(); int ch; - while ((ch = reader.read()) != -1) { + while ((ch = instream.read()) != -1) { if (ch == 13) { buffer.append("[\\r]"); } else if (ch == 10) { buffer.append("[\\n]\""); buffer.insert(0, "\""); buffer.insert(0, header); - WIRE_LOG.debug(buffer.toString()); + WIRE_LOG.info(buffer.toString()); buffer.setLength(0); } else if ((ch < 32) || (ch > 127)) { buffer.append("[0x"); @@ -84,12 +75,16 @@ buffer.append("\""); buffer.insert(0, "\""); buffer.insert(0, header); - WIRE_LOG.debug(buffer.toString()); + WIRE_LOG.info(buffer.toString()); } } public static final boolean enabled() { + return WIRE_LOG.isInfoEnabled(); + } + + public static final boolean debugEnabled() { return WIRE_LOG.isDebugEnabled(); }