hc-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r1417377 - in /httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client: AbstractHttpClient.java CloseableHttpClient.java builder/InternalHttpClient.java
Date Wed, 05 Dec 2012 12:17:39 GMT
Author: olegk
Date: Wed Dec  5 12:17:39 2012
New Revision: 1417377

URL: http://svn.apache.org/viewvc?rev=1417377&view=rev
Log:
Fixed binary compatiblity breakage

Modified:
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AbstractHttpClient.java
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/CloseableHttpClient.java
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/builder/InternalHttpClient.java

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AbstractHttpClient.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AbstractHttpClient.java?rev=1417377&r1=1417376&r2=1417377&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AbstractHttpClient.java
(original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AbstractHttpClient.java
Wed Dec  5 12:17:39 2012
@@ -777,7 +777,7 @@ public abstract class AbstractHttpClient
     }
 
     @Override
-	public final CloseableHttpResponse execute(HttpHost target, HttpRequest request,
+	protected final CloseableHttpResponse doExecute(HttpHost target, HttpRequest request,
                                       HttpContext context)
         throws IOException, ClientProtocolException {
 

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/CloseableHttpClient.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/CloseableHttpClient.java?rev=1417377&r1=1417376&r2=1417377&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/CloseableHttpClient.java
(original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/CloseableHttpClient.java
Wed Dec  5 12:17:39 2012
@@ -58,16 +58,23 @@ public abstract class CloseableHttpClien
 
     private final Log log = LogFactory.getLog(getClass());
 
-    public abstract CloseableHttpResponse execute(HttpHost target, HttpRequest request,
+    protected abstract CloseableHttpResponse doExecute(HttpHost target, HttpRequest request,
             HttpContext context) throws IOException, ClientProtocolException;
 
     public CloseableHttpResponse execute(
+            final HttpHost target,
+            final HttpRequest request,
+            final HttpContext context) throws IOException, ClientProtocolException {
+        return doExecute(target, request, context);
+    }
+
+    public CloseableHttpResponse execute(
             final HttpUriRequest request,
             final HttpContext context) throws IOException, ClientProtocolException {
         if (request == null) {
             throw new IllegalArgumentException("Request must not be null.");
         }
-        return execute(determineTarget(request), request, context);
+        return doExecute(determineTarget(request), request, context);
     }
 
     private static HttpHost determineTarget(HttpUriRequest request) throws ClientProtocolException
{
@@ -94,7 +101,7 @@ public abstract class CloseableHttpClien
     public CloseableHttpResponse execute(
             final HttpHost target,
             final HttpRequest request) throws IOException, ClientProtocolException {
-        return execute(target, request, (HttpContext) null);
+        return doExecute(target, request, (HttpContext) null);
     }
 
     public <T> T execute(final HttpUriRequest request,

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/builder/InternalHttpClient.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/builder/InternalHttpClient.java?rev=1417377&r1=1417376&r2=1417377&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/builder/InternalHttpClient.java
(original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/builder/InternalHttpClient.java
Wed Dec  5 12:17:39 2012
@@ -150,7 +150,7 @@ class InternalHttpClient extends Closeab
     }
 
     @Override
-	public CloseableHttpResponse execute(
+	protected CloseableHttpResponse doExecute(
             final HttpHost target,
             final HttpRequest request,
             final HttpContext context) throws IOException, ClientProtocolException {



Mime
View raw message