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

Minor code improvements in the DefaultClientRequestRedirector and SingleClientConnManager 

git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@650979 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Oleg Kalnichevski 2008-04-23 18:23:15 +00:00
parent 374228c58c
commit 56baf77bb2
2 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
module-client/src/main/java/org/apache/http/impl/client/DefaultClientRequestDirector.java
View File

@ -385,8 +385,7 @@ public class DefaultClientRequestDirector
response.setParams(params);
requestExec.postProcess(response, httpProcessor, context);
RoutedRequest followup =
handleResponse(roureq, wrapper, response, context);
RoutedRequest followup = handleResponse(roureq, response, context);
if (followup == null) {
done = true;
} else {
@ -407,8 +406,6 @@ public class DefaultClientRequestDirector
// check if we can use the same connection for the followup
if (!followup.getRoute().equals(roureq.getRoute())) {
// the followup has a different route, release conn
//@@@ need to consume response body first?
//@@@ or let that be done in handleResponse(...)?
connManager.releaseConnection(managedConn);
managedConn = null;
}
@ -778,10 +775,7 @@ public class DefaultClientRequestDirector
/**
* Analyzes a response to check need for a followup.
*
* @param roureq the request and route. This is the same object as
* was passed to {@link #wrapRequest(HttpRequest)}.
* @param request the request that was actually sent. This is the object
* returned by {@link #wrapRequest(HttpRequest)}.
* @param roureq the request and route.
* @param response the response to analayze
* @param context the context used for the current request execution
*
@ -792,7 +786,6 @@ public class DefaultClientRequestDirector
* @throws IOException in case of an IO problem
*/
protected RoutedRequest handleResponse(RoutedRequest roureq,
HttpRequest request,
HttpResponse response,
HttpContext context)
throws HttpException, IOException {
@ -800,6 +793,7 @@ public class DefaultClientRequestDirector
HttpRoute route = roureq.getRoute();
HttpHost target = route.getTargetHost();
HttpHost proxy = route.getProxyHost();
RequestWrapper request = roureq.getRequest();
HttpParams params = request.getParams();
if (HttpClientParams.isRedirecting(params) &&
@ -916,10 +910,6 @@ public class DefaultClientRequestDirector
// we got here as the result of an exception
// no response will be returned, release the connection
managedConn = null;
// ensure the connection manager properly releases this connection
connManager.releaseConnection(mcc);
//@@@ is the connection in a re-usable state? consume response?
//@@@ for now, just shut it down
try {
mcc.abortConnection();
} catch (IOException ex) {
@ -927,6 +917,8 @@ public class DefaultClientRequestDirector
LOG.debug(ex.getMessage(), ex);
}
}
// ensure the connection manager properly releases this connection
connManager.releaseConnection(mcc);
}
} // abortConnection

7
module-client/src/main/java/org/apache/http/impl/conn/SingleClientConnManager.java
View File

@ -252,12 +252,13 @@ public class SingleClientConnManager implements ClientConnectionManager {
}
ConnAdapter sca = (ConnAdapter) conn;
if (sca.getManager() != this) {
if (sca.poolEntry == null)
return; // already released
ClientConnectionManager manager = sca.getManager();
if (manager != null && manager != this) {
throw new IllegalArgumentException
("Connection not obtained from this manager.");
}
if (sca.poolEntry == null)
return; // already released
try {
// make sure that the response has been read completely