From a0faec6ccd145e0dd843073684a64230eab25c2d Mon Sep 17 00:00:00 2001
From: Oleg Kalnichevski <olegk@apache.org>
Date: Fri, 15 Jun 2007 21:48:09 +0000
Subject: [PATCH] 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
---
 .../http/impl/conn/DefaultClientConnection.java  | 16 +++++++++++++---
 .../conn/LoggingHttpDataReceiverDecorator.java   |  5 -----
 .../LoggingHttpDataTransmitterDecorator.java     |  5 -----
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/module-client/src/main/java/org/apache/http/impl/conn/DefaultClientConnection.java b/module-client/src/main/java/org/apache/http/impl/conn/DefaultClientConnection.java
index 4e80ba369..5ff515b96 100644
--- a/module-client/src/main/java/org/apache/http/impl/conn/DefaultClientConnection.java
+++ b/module-client/src/main/java/org/apache/http/impl/conn/DefaultClientConnection.java
@@ -97,7 +97,7 @@ public class DefaultClientConnection extends SocketHttpClientConnection
 
     // non-javadoc, see interface OperatedClientConnection
     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(
+            final Socket socket,
+            int buffersize,
             final HttpParams params) throws IOException {
-        HttpDataReceiver receiver = super.createHttpDataReceiver(params);
+        HttpDataReceiver receiver = super.createHttpDataReceiver(
+                socket, 
+                buffersize,
+                params);
         if (WIRE_LOG.isDebugEnabled()) {
             receiver = new LoggingHttpDataReceiverDecorator(receiver, new Wire(WIRE_LOG));
         }
@@ -147,8 +152,13 @@ public class DefaultClientConnection extends SocketHttpClientConnection
 
     
     protected HttpDataTransmitter createHttpDataTransmitter(
+            final Socket socket,
+            int buffersize,
             final HttpParams params) throws IOException {
-        HttpDataTransmitter transmitter = super.createHttpDataTransmitter(params);
+        HttpDataTransmitter transmitter = super.createHttpDataTransmitter(
+                socket,
+                buffersize,
+                params);
         if (WIRE_LOG.isDebugEnabled()) {
             transmitter = new LoggingHttpDataTransmitterDecorator(transmitter, new Wire(WIRE_LOG));
         }
diff --git a/module-client/src/main/java/org/apache/http/impl/conn/LoggingHttpDataReceiverDecorator.java b/module-client/src/main/java/org/apache/http/impl/conn/LoggingHttpDataReceiverDecorator.java
index 89211cd98..930038832 100644
--- a/module-client/src/main/java/org/apache/http/impl/conn/LoggingHttpDataReceiverDecorator.java
+++ b/module-client/src/main/java/org/apache/http/impl/conn/LoggingHttpDataReceiverDecorator.java
@@ -34,7 +34,6 @@ import java.io.IOException;
 
 import org.apache.http.io.HttpDataReceiver;
 import org.apache.http.io.HttpTransportMetrics;
-import org.apache.http.params.HttpParams;
 import org.apache.http.util.CharArrayBuffer;
 
 /**
@@ -65,10 +64,6 @@ class LoggingHttpDataReceiverDecorator implements HttpDataReceiver {
         this.wire = wire;
     }
 
-    public void reset(final HttpParams params) {
-        this.in.reset(params);
-    }
-    
     public boolean isDataAvailable(int timeout) throws IOException {
         return this.in.isDataAvailable(timeout);
     }
diff --git a/module-client/src/main/java/org/apache/http/impl/conn/LoggingHttpDataTransmitterDecorator.java b/module-client/src/main/java/org/apache/http/impl/conn/LoggingHttpDataTransmitterDecorator.java
index 4f82728f7..bf55ee5da 100644
--- a/module-client/src/main/java/org/apache/http/impl/conn/LoggingHttpDataTransmitterDecorator.java
+++ b/module-client/src/main/java/org/apache/http/impl/conn/LoggingHttpDataTransmitterDecorator.java
@@ -34,7 +34,6 @@ import java.io.IOException;
 
 import org.apache.http.io.HttpDataTransmitter;
 import org.apache.http.io.HttpTransportMetrics;
-import org.apache.http.params.HttpParams;
 import org.apache.http.util.CharArrayBuffer;
 
 /**
@@ -63,10 +62,6 @@ class LoggingHttpDataTransmitterDecorator implements HttpDataTransmitter {
         this.wire = wire;
     }
     
-    public void reset(final HttpParams params) {
-        this.out.reset(params);
-    }
-    
     public void write(byte[] b, int off, int len) throws IOException {
         this.out.write(b,  off,  len);
         if (this.wire.enabled()) {