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

Fixed binary compatiblity breakage 

git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1417377 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Oleg Kalnichevski 2012-12-05 12:17:39 +00:00
parent 9aea057953
commit 9b6aeffa80
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
httpclient/src/main/java/org/apache/http/impl/client/AbstractHttpClient.java
View File

@ -777,7 +777,7 @@ public abstract class AbstractHttpClient extends CloseableHttpClient {
}
@Override
public final CloseableHttpResponse execute(HttpHost target, HttpRequest request,
protected final CloseableHttpResponse doExecute(HttpHost target, HttpRequest request,
HttpContext context)
throws IOException, ClientProtocolException {

13
httpclient/src/main/java/org/apache/http/impl/client/CloseableHttpClient.java
View File

@ -58,16 +58,23 @@ public abstract class CloseableHttpClient implements HttpClient, Closeable {
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 CloseableHttpClient implements HttpClient, Closeable {
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,

2
httpclient/src/main/java/org/apache/http/impl/client/builder/InternalHttpClient.java
View File

@ -150,7 +150,7 @@ class InternalHttpClient extends CloseableHttpClient {
}
@Override
public CloseableHttpResponse execute(
protected CloseableHttpResponse doExecute(
final HttpHost target,
final HttpRequest request,
final HttpContext context) throws IOException, ClientProtocolException {