Apache
/
httpcomponents-client
mirror of https://github.com/apache/httpcomponents-client.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed API breakage caused by HTTPCORE-64 

git-svn-id: https://svn.apache.org/repos/asf/jakarta/httpcomponents/httpclient/trunk@547804 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Oleg Kalnichevski 2007-06-15 21:48:09 +00:00
parent ecefd447fd
commit a0faec6ccd
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
module-client/src/main/java/org/apache/http/impl/conn/DefaultClientConnection.java
View File

@ -97,7 +97,7 @@ public class DefaultClientConnection extends SocketHttpClientConnection
// non-javadoc, see interface OperatedClientConnection // non-javadoc, see interface OperatedClientConnection
public final Socket getSocket() { public final Socket getSocket() {
return this.socket; // base class attribute return getSocket(); // base class attribute
} }
@ -137,8 +137,13 @@ public class DefaultClientConnection extends SocketHttpClientConnection
protected HttpDataReceiver createHttpDataReceiver( protected HttpDataReceiver createHttpDataReceiver(
final Socket socket,
int buffersize,
final HttpParams params) throws IOException { final HttpParams params) throws IOException {
HttpDataReceiver receiver = super.createHttpDataReceiver(params); HttpDataReceiver receiver = super.createHttpDataReceiver(
socket,
buffersize,
params);
if (WIRE_LOG.isDebugEnabled()) { if (WIRE_LOG.isDebugEnabled()) {
receiver = new LoggingHttpDataReceiverDecorator(receiver, new Wire(WIRE_LOG)); receiver = new LoggingHttpDataReceiverDecorator(receiver, new Wire(WIRE_LOG));
} }
@ -147,8 +152,13 @@ public class DefaultClientConnection extends SocketHttpClientConnection
protected HttpDataTransmitter createHttpDataTransmitter( protected HttpDataTransmitter createHttpDataTransmitter(
final Socket socket,
int buffersize,
final HttpParams params) throws IOException { final HttpParams params) throws IOException {
HttpDataTransmitter transmitter = super.createHttpDataTransmitter(params); HttpDataTransmitter transmitter = super.createHttpDataTransmitter(
socket,
buffersize,
params);
if (WIRE_LOG.isDebugEnabled()) { if (WIRE_LOG.isDebugEnabled()) {
transmitter = new LoggingHttpDataTransmitterDecorator(transmitter, new Wire(WIRE_LOG)); transmitter = new LoggingHttpDataTransmitterDecorator(transmitter, new Wire(WIRE_LOG));
} }

5
module-client/src/main/java/org/apache/http/impl/conn/LoggingHttpDataReceiverDecorator.java
View File

@ -34,7 +34,6 @@ import java.io.IOException;
import org.apache.http.io.HttpDataReceiver; import org.apache.http.io.HttpDataReceiver;
import org.apache.http.io.HttpTransportMetrics; import org.apache.http.io.HttpTransportMetrics;
import org.apache.http.params.HttpParams;
import org.apache.http.util.CharArrayBuffer; import org.apache.http.util.CharArrayBuffer;
/** /**
@ -65,10 +64,6 @@ class LoggingHttpDataReceiverDecorator implements HttpDataReceiver {
this.wire = wire; this.wire = wire;
} }
public void reset(final HttpParams params) {
this.in.reset(params);
}
public boolean isDataAvailable(int timeout) throws IOException { public boolean isDataAvailable(int timeout) throws IOException {
return this.in.isDataAvailable(timeout); return this.in.isDataAvailable(timeout);
} }

5
module-client/src/main/java/org/apache/http/impl/conn/LoggingHttpDataTransmitterDecorator.java
View File

@ -34,7 +34,6 @@ import java.io.IOException;
import org.apache.http.io.HttpDataTransmitter; import org.apache.http.io.HttpDataTransmitter;
import org.apache.http.io.HttpTransportMetrics; import org.apache.http.io.HttpTransportMetrics;
import org.apache.http.params.HttpParams;
import org.apache.http.util.CharArrayBuffer; import org.apache.http.util.CharArrayBuffer;
/** /**
@ -63,10 +62,6 @@ class LoggingHttpDataTransmitterDecorator implements HttpDataTransmitter {
this.wire = wire; this.wire = wire;
} }
public void reset(final HttpParams params) {
this.out.reset(params);
}
public void write(byte[] b, int off, int len) throws IOException { public void write(byte[] b, int off, int len) throws IOException {
this.out.write(b, off, len); this.out.write(b, off, len);
if (this.wire.enabled()) { if (this.wire.enabled()) {