diff --git a/module-client/src/examples/org/apache/http/examples/conn/ManagerConnectDirect.java b/module-client/src/examples/org/apache/http/examples/conn/ManagerConnectDirect.java index 7dd521c56..a0a7d76dc 100644 --- a/module-client/src/examples/org/apache/http/examples/conn/ManagerConnectDirect.java +++ b/module-client/src/examples/org/apache/http/examples/conn/ManagerConnectDirect.java @@ -117,7 +117,7 @@ public class ManagerConnectDirect { conn.flush(); System.out.println("receiving response header"); - HttpResponse rsp = conn.receiveResponseHeader(getParams()); + HttpResponse rsp = conn.receiveResponseHeader(); System.out.println("----------------------------------------"); System.out.println(rsp.getStatusLine()); diff --git a/module-client/src/examples/org/apache/http/examples/conn/ManagerConnectProxy.java b/module-client/src/examples/org/apache/http/examples/conn/ManagerConnectProxy.java index e1826ac65..bfa7c7389 100644 --- a/module-client/src/examples/org/apache/http/examples/conn/ManagerConnectProxy.java +++ b/module-client/src/examples/org/apache/http/examples/conn/ManagerConnectProxy.java @@ -124,7 +124,7 @@ public class ManagerConnectProxy { conn.flush(); System.out.println("receiving confirmation for tunnel"); - HttpResponse connected = conn.receiveResponseHeader(getParams()); + HttpResponse connected = conn.receiveResponseHeader(); System.out.println("----------------------------------------"); printResponseHeader(connected); System.out.println("----------------------------------------"); @@ -149,7 +149,7 @@ public class ManagerConnectProxy { conn.flush(); System.out.println("receiving response header"); - HttpResponse rsp = conn.receiveResponseHeader(getParams()); + HttpResponse rsp = conn.receiveResponseHeader(); System.out.println("----------------------------------------"); printResponseHeader(rsp); diff --git a/module-client/src/examples/org/apache/http/examples/conn/OperatorConnectDirect.java b/module-client/src/examples/org/apache/http/examples/conn/OperatorConnectDirect.java index ce0cfed95..62c16a1f3 100644 --- a/module-client/src/examples/org/apache/http/examples/conn/OperatorConnectDirect.java +++ b/module-client/src/examples/org/apache/http/examples/conn/OperatorConnectDirect.java @@ -111,7 +111,7 @@ public class OperatorConnectDirect { conn.flush(); System.out.println("receiving response header"); - HttpResponse rsp = conn.receiveResponseHeader(getParams()); + HttpResponse rsp = conn.receiveResponseHeader(); System.out.println("----------------------------------------"); System.out.println(rsp.getStatusLine()); diff --git a/module-client/src/examples/org/apache/http/examples/conn/OperatorConnectProxy.java b/module-client/src/examples/org/apache/http/examples/conn/OperatorConnectProxy.java index b6769bc2b..a505335bc 100644 --- a/module-client/src/examples/org/apache/http/examples/conn/OperatorConnectProxy.java +++ b/module-client/src/examples/org/apache/http/examples/conn/OperatorConnectProxy.java @@ -117,7 +117,7 @@ public class OperatorConnectProxy { conn.flush(); System.out.println("receiving confirmation for tunnel"); - HttpResponse connected = conn.receiveResponseHeader(getParams()); + HttpResponse connected = conn.receiveResponseHeader(); System.out.println("----------------------------------------"); printResponseHeader(connected); System.out.println("----------------------------------------"); @@ -147,7 +147,7 @@ public class OperatorConnectProxy { conn.flush(); System.out.println("receiving response header"); - HttpResponse rsp = conn.receiveResponseHeader(getParams()); + HttpResponse rsp = conn.receiveResponseHeader(); System.out.println("----------------------------------------"); printResponseHeader(rsp); diff --git a/module-client/src/main/java/org/apache/http/impl/conn/AbstractClientConnAdapter.java b/module-client/src/main/java/org/apache/http/impl/conn/AbstractClientConnAdapter.java index 3a1847f90..4f0a327fb 100644 --- a/module-client/src/main/java/org/apache/http/impl/conn/AbstractClientConnAdapter.java +++ b/module-client/src/main/java/org/apache/http/impl/conn/AbstractClientConnAdapter.java @@ -38,13 +38,11 @@ import org.apache.http.HttpException; import org.apache.http.HttpRequest; import org.apache.http.HttpEntityEnclosingRequest; import org.apache.http.HttpResponse; -import org.apache.http.params.HttpParams; import org.apache.http.conn.OperatedClientConnection; import org.apache.http.conn.ManagedClientConnection; import org.apache.http.conn.ClientConnectionManager; - /** * Abstract adapter from {@link OperatedClientConnection operated} to * {@link ManagedClientConnection managed} client connections. @@ -180,12 +178,12 @@ public abstract class AbstractClientConnAdapter // non-javadoc, see interface HttpClientConnection - public HttpResponse receiveResponseHeader(HttpParams params) + public HttpResponse receiveResponseHeader() throws HttpException, IOException { assertWrappedConn(); markedReusable = false; - return wrappedConnection.receiveResponseHeader(params); + return wrappedConnection.receiveResponseHeader(); } 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 14bcd628a..c699b044a 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 @@ -208,9 +208,8 @@ public class DefaultClientConnection extends SocketHttpClientConnection } // update - public HttpResponse receiveResponseHeader( - final HttpParams params) throws HttpException, IOException { - HttpResponse response = super.receiveResponseHeader(params); + public HttpResponse receiveResponseHeader() throws HttpException, IOException { + HttpResponse response = super.receiveResponseHeader(); if (HEADERS_LOG.isDebugEnabled()) { HEADERS_LOG.debug("<< " + response.getStatusLine().toString()); Header[] headers = response.getAllHeaders();