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 compatibility breakage 

git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@884245 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Oleg Kalnichevski 2009-11-25 20:13:14 +00:00
parent 9d55b80d47
commit 5fefbfaa1b
2 changed files with 4 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -130,8 +130,6 @@ import org.apache.http.protocol.ImmutableHttpProcessor;
* <li>{@link RedirectStrategy}</li> object used to determine if an HTTP
* request should be redirected to a new location in response to an HTTP
* response received from the target server.
* The {@link #createRedirectStrategy()} must be implemented
* by concrete super classes to instantiate this object.
* <li>{@link UserTokenHandler}</li> object used to determine if the
* execution context is user identity specific.
* The {@link #createUserTokenHandler()} must be implemented by
@ -273,11 +271,6 @@ public abstract class AbstractHttpClient implements HttpClient {
@Deprecated
protected abstract org.apache.http.client.RedirectHandler createRedirectHandler();
/**
* @since 4.1
*/
protected abstract RedirectStrategy createRedirectStrategy();
protected abstract AuthenticationHandler createTargetAuthenticationHandler();
@ -296,7 +289,6 @@ public abstract class AbstractHttpClient implements HttpClient {
protected abstract UserTokenHandler createUserTokenHandler();
// non-javadoc, see interface HttpClient
public synchronized final HttpParams getParams() {
if (defaultParams == null) {
@ -412,9 +404,10 @@ public abstract class AbstractHttpClient implements HttpClient {
/**
* @since 4.1
*/
@SuppressWarnings("deprecation")
public synchronized final RedirectStrategy getRedirectStrategy() {
if (redirectStrategy == null) {
redirectStrategy = createRedirectStrategy();
redirectStrategy = new DefaultRedirectStrategyAdaptor(createRedirectHandler());
}
return redirectStrategy;
}
@ -685,7 +678,7 @@ public abstract class AbstractHttpClient implements HttpClient {
getRoutePlanner(),
getProtocolProcessor(),
getHttpRequestRetryHandler(),
getRedirectHandler(),
getRedirectStrategy(),
getTargetAuthenticationHandler(),
getProxyAuthenticationHandler(),
getUserTokenHandler(),

11
httpclient/src/main/java/org/apache/http/impl/client/DefaultHttpClient.java
View File

@ -36,7 +36,6 @@ import org.apache.http.client.AuthenticationHandler;
import org.apache.http.client.CookieStore;
import org.apache.http.client.CredentialsProvider;
import org.apache.http.client.HttpRequestRetryHandler;
import org.apache.http.client.RedirectStrategy;
import org.apache.http.client.UserTokenHandler;
import org.apache.http.client.params.AuthPolicy;
import org.apache.http.client.params.ClientPNames;
@ -165,6 +164,7 @@ public class DefaultHttpClient extends AbstractHttpClient {
final ClientConnectionManager conman,
final HttpParams params) {
super(conman, params);
setRedirectStrategy(new DefaultRedirectStrategy());
}
@ -357,15 +357,6 @@ public class DefaultHttpClient extends AbstractHttpClient {
return new DefaultRedirectHandler();
}
/**
* @since 4.1
*/
@Override
protected RedirectStrategy createRedirectStrategy() {
return new DefaultRedirectStrategy();
}
@Override
protected AuthenticationHandler createTargetAuthenticationHandler() {
return new DefaultTargetAuthenticationHandler();