hc-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r547804 - in /jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/conn: DefaultClientConnection.java LoggingHttpDataReceiverDecorator.java LoggingHttpDataTransmitterDecorator.java
Date Fri, 15 Jun 2007 21:48:10 GMT
Author: olegk
Date: Fri Jun 15 14:48:09 2007
New Revision: 547804

URL: http://svn.apache.org/viewvc?view=rev&rev=547804
Log:
Fixed API breakage caused by HTTPCORE-64

Modified:
    jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/conn/DefaultClientConnection.java
    jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/conn/LoggingHttpDataReceiverDecorator.java
    jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/conn/LoggingHttpDataTransmitterDecorator.java

Modified: jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/conn/DefaultClientConnection.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/conn/DefaultClientConnection.java?view=diff&rev=547804&r1=547803&r2=547804
==============================================================================
--- jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/conn/DefaultClientConnection.java
(original)
+++ jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/conn/DefaultClientConnection.java
Fri Jun 15 14:48:09 2007
@@ -97,7 +97,7 @@
 
     // non-javadoc, see interface OperatedClientConnection
     public final Socket getSocket() {
-        return this.socket; // base class attribute
+        return getSocket(); // base class attribute
     }
 
 
@@ -137,8 +137,13 @@
 
 
     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 @@
 
     
     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));
         }

Modified: jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/conn/LoggingHttpDataReceiverDecorator.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/conn/LoggingHttpDataReceiverDecorator.java?view=diff&rev=547804&r1=547803&r2=547804
==============================================================================
--- jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/conn/LoggingHttpDataReceiverDecorator.java
(original)
+++ jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/conn/LoggingHttpDataReceiverDecorator.java
Fri Jun 15 14:48:09 2007
@@ -34,7 +34,6 @@
 
 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 @@
         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);
     }

Modified: jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/conn/LoggingHttpDataTransmitterDecorator.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/conn/LoggingHttpDataTransmitterDecorator.java?view=diff&rev=547804&r1=547803&r2=547804
==============================================================================
--- jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/conn/LoggingHttpDataTransmitterDecorator.java
(original)
+++ jakarta/httpcomponents/httpclient/trunk/module-client/src/main/java/org/apache/http/impl/conn/LoggingHttpDataTransmitterDecorator.java
Fri Jun 15 14:48:09 2007
@@ -34,7 +34,6 @@
 
 import org.apache.http.io.HttpDataTransmitter;
 import org.apache.http.io.HttpTransportMetrics;
-import org.apache.http.params.HttpParams;
 import org.apache.http.util.CharArrayBuffer;
 
 /**
@@ -61,10 +60,6 @@
         super();
         this.out = out;
         this.wire = wire;
-    }
-    
-    public void reset(final HttpParams params) {
-        this.out.reset(params);
     }
     
     public void write(byte[] b, int off, int len) throws IOException {



Mime
View raw message