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

reuse strategy in client and director 

git-svn-id: https://svn.apache.org/repos/asf/jakarta/httpcomponents/httpclient/trunk@509247 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Roland Weber 2007-02-19 16:42:29 +00:00
parent bd3314ae08
commit 2f777ced6d
3 changed files with 86 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/java/org/apache/http/impl/client/AbstractHttpClient.java
View File

@ -37,6 +37,7 @@ import org.apache.http.HttpHost;
import org.apache.http.HttpRequest;
import org.apache.http.HttpResponse;
import org.apache.http.HttpException;
import org.apache.http.ConnectionReuseStrategy;
import org.apache.http.params.HttpParams;
import org.apache.http.protocol.HttpContext;
import org.apache.http.protocol.SyncHttpExecutionContext;
@ -73,6 +74,9 @@ public abstract class AbstractHttpClient
/** The connection manager. */
protected ClientConnectionManager connManager;
/** The connection re-use strategy. */
protected ConnectionReuseStrategy reuseStrategy;
/** The HTTP processor, if defined. */
protected BasicHttpProcessor httpProcessor;
@ -87,14 +91,12 @@ public abstract class AbstractHttpClient
* {@link SyncHttpExecutionContext SyncHttpExecutionContext}
* @param params the parameters
* @param conman the connection manager
* @param hproc the HTTP processor, or <code>null</code>
* @param schemes the scheme registry, or
* <code>null</code> to use the
* {@link SchemeRegistry#DEFAULT default}
*/
protected AbstractHttpClient(HttpContext context, HttpParams params,
ClientConnectionManager conman,
BasicHttpProcessor hproc,
SchemeRegistry schemes) {
if (params == null)
throw new IllegalArgumentException
@ -107,10 +109,13 @@ public abstract class AbstractHttpClient
context : new SyncHttpExecutionContext(null);
defaultParams = params;
connManager = conman;
httpProcessor = hproc;
supportedSchemes = (schemes != null) ?
schemes : SchemeRegistry.DEFAULT;
// to be initialized by derived class constructors, if needed:
reuseStrategy = null;
httpProcessor = null;
} // constructor

73
src/java/org/apache/http/impl/client/DefaultClientRequestDirector.java
View File

@ -37,6 +37,7 @@ import org.apache.http.HttpVersion;
import org.apache.http.HttpRequest;
import org.apache.http.HttpResponse;
import org.apache.http.HttpException;
import org.apache.http.ConnectionReuseStrategy;
import org.apache.http.HttpEntity;
import org.apache.http.entity.BasicHttpEntity;
import org.apache.http.message.BasicHttpRequest;
@ -72,6 +73,9 @@ public class DefaultClientRequestDirector
/** The connection manager. */
protected final ClientConnectionManager connManager;
/** The connection re-use strategy. */
protected final ConnectionReuseStrategy reuseStrategy;
/** The request executor. */
protected final HttpRequestExecutor requestExec;
@ -83,10 +87,12 @@ public class DefaultClientRequestDirector
public DefaultClientRequestDirector(ClientConnectionManager conman,
ConnectionReuseStrategy reustrat,
HttpRequestExecutor reqexec,
HttpParams params) {
this.connManager = conman;
this.reuseStrategy = reustrat;
this.requestExec = reqexec;
this.defaultParams = params;
@ -147,7 +153,7 @@ public class DefaultClientRequestDirector
} finally {
// if 'done' is false, we're handling an exception
cleanupConnection(done, response);
cleanupConnection(done, response, context);
}
return response;
@ -197,15 +203,15 @@ public class DefaultClientRequestDirector
//@@@ probably not, because the parent is replaced
//@@@ just make sure we don't link parameters to themselves
System.out.println("@@@ planned: " + route);
//System.out.println("@@@ planned: " + route);
RouteDirector rowdy = new RouteDirector();
int step;
do {
HttpRoute fact = managedConn.getRoute();
System.out.println("@@@ current: " + fact);
//System.out.println("@@@ current: " + fact);
step = rowdy.nextStep(route, fact);
System.out.println("@@@ action => " + step);
//System.out.println("@@@ action => " + step);
switch (step) {
@ -284,7 +290,7 @@ public class DefaultClientRequestDirector
// How to decide on security of the tunnelled connection?
// The socket factory knows only about the segment to the proxy.
// Even if that is secure, the hop to the target may be insecure.
// Leave it to derived classes, consider everything insecure here.
// Leave it to derived classes, consider insecure by default here.
return false;
}
@ -387,10 +393,13 @@ public class DefaultClientRequestDirector
* <code>false</code> if exception handling is in progress
* @param response the response available for return by
* {@link #execute execute}, or <code>null</code>
* @param context the context used for the last request execution
*
* @throws IOException in case of an IO problem
*/
protected void cleanupConnection(boolean success, HttpResponse response)
protected void cleanupConnection(boolean success,
HttpResponse response,
HttpContext context)
throws IOException {
ManagedClientConnection mcc = managedConn;
@ -398,24 +407,22 @@ public class DefaultClientRequestDirector
return; // nothing to be cleaned up
if (success) {
// not in exception handling, there probably is a response
// the connection (if any) is in a re-usable state
// Not in exception handling, there probably is a response.
// The connection is in or can be brought to a re-usable state.
boolean reuse = false;
if (reuseStrategy != null)
reuse = reuseStrategy.keepAlive(response, context);
// check for entity, release connection if possible
//@@@ provide hook that allows for entity buffering?
if ((response == null) || (response.getEntity() == null) ||
!response.getEntity().isStreaming()) {
// connection not needed and assumed to be in re-usable state
//@@@ evaluate connection re-use strategy,
//@@@ close and/or mark as non-reusable if necessary
// connection not needed and (assumed to be) in re-usable state
managedConn = null;
if (reuse)
mcc.markReusable();
connManager.releaseConnection(mcc);
} else {
// install an auto-release entity
HttpEntity entity = response.getEntity();
//@@@ evaluate connection re-use strategy
boolean reuse = false;
response.setEntity(new BasicManagedEntity(entity, mcc, reuse));
setupResponseEntity(response, context, reuse);
}
} else {
// we got here as the result of an exception
@ -433,4 +440,36 @@ public class DefaultClientRequestDirector
} // cleanupConnection
/**
* Prepares the entity in the ultimate response being returned.
* The default implementation here installs an entity with auto-release
* capability for the connection.
* <br/>
* This method might be overridden to buffer the response entity
* and release the connection immediately.
* Derived implementations MUST release the connection if an exception
* is thrown here!
*
* @param response the response holding the entity to prepare
* @param context the context used for the last request execution
* @param reuse <code>true</code> if the connection should be
* kept alive and re-used for another request,
* <code>false</code> if the connection should be
* closed and not re-used
*
* @throws IOException in case of an IO problem.
* The connection MUST be released in this method if
* an exception is thrown!
*/
protected void setupResponseEntity(HttpResponse response,
HttpContext context,
boolean reuse)
throws IOException {
// install an auto-release entity
HttpEntity entity = response.getEntity();
response.setEntity(new BasicManagedEntity(entity, managedConn, reuse));
}
} // class DefaultClientRequestDirector

24
src/java/org/apache/http/impl/client/DefaultHttpClient.java
View File

@ -37,6 +37,8 @@ import org.apache.http.HttpHost;
import org.apache.http.HttpRequest;
import org.apache.http.HttpResponse;
import org.apache.http.HttpException;
import org.apache.http.ConnectionReuseStrategy;
import org.apache.http.impl.DefaultConnectionReuseStrategy;
import org.apache.http.params.HttpParams;
import org.apache.http.protocol.HttpContext;
import org.apache.http.protocol.BasicHttpProcessor;
@ -80,8 +82,11 @@ public class DefaultHttpClient extends AbstractHttpClient {
public DefaultHttpClient(HttpParams params,
ClientConnectionManager conman,
SchemeRegistry schemes) {
super(null, params, conman, null, schemes);
super(null, params, conman, schemes);
httpProcessor = createProcessor();
reuseStrategy = createReuseStrategy();
}
@ -101,6 +106,20 @@ public class DefaultHttpClient extends AbstractHttpClient {
}
/**
* Creates a connection reuse strategy.
* This method is typically called by the constructor,
* after the base class has been initialized.
*/
protected ConnectionReuseStrategy createReuseStrategy() {
//@@@ evaluate defaultParams to determine implementation
ConnectionReuseStrategy rus = new DefaultConnectionReuseStrategy();
return rus;
}
// non-javadoc, see interface HttpClient
public HttpResponse execute(RoutedRequest roureq, HttpContext context)
throws HttpException, IOException {
@ -173,8 +192,7 @@ public class DefaultHttpClient extends AbstractHttpClient {
reqexec.setParams(defaultParams);
return new DefaultClientRequestDirector
(connManager, reqexec, defaultParams);
(connManager, reuseStrategy, reqexec, defaultParams);
}
} // class DefaultHttpClient