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

Added #reset() and #releaseConnection() methods to HttpRequestBase 

git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1145177 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Oleg Kalnichevski 2011-07-11 13:58:24 +00:00
parent a03573ca24
commit d5b66aa9d8
1 changed files with 52 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
httpclient/src/main/java/org/apache/http/client/methods/HttpRequestBase.java
View File

@ -46,8 +46,8 @@ import org.apache.http.params.HttpParams;
import org.apache.http.params.HttpProtocolParams;
/**
* Basic implementation of an HTTP request that can be modified.
*
* Basic implementation of an HTTP request that can be modified. Methods of the
* {@link AbortableHttpRequest) interface implemented by this class are thread safe.
*
* @since 4.0
*/
@ -56,8 +56,7 @@ public abstract class HttpRequestBase extends AbstractHttpMessage
implements HttpUriRequest, AbortableHttpRequest, Cloneable {
private Lock abortLock;
private boolean aborted;
private volatile boolean aborted;
private URI uri;
private ClientConnectionRequest connRequest;
@ -104,13 +103,11 @@ public abstract class HttpRequestBase extends AbstractHttpMessage
public void setConnectionRequest(final ClientConnectionRequest connRequest)
throws IOException {
this.abortLock.lock();
try {
if (this.aborted) {
throw new IOException("Request already aborted");
}
this.releaseTrigger = null;
this.abortLock.lock();
try {
this.connRequest = connRequest;
} finally {
this.abortLock.unlock();
@ -119,56 +116,73 @@ public abstract class HttpRequestBase extends AbstractHttpMessage
public void setReleaseTrigger(final ConnectionReleaseTrigger releaseTrigger)
throws IOException {
this.abortLock.lock();
try {
if (this.aborted) {
throw new IOException("Request already aborted");
}
this.connRequest = null;
this.abortLock.lock();
try {
this.releaseTrigger = releaseTrigger;
} finally {
this.abortLock.unlock();
}
}
public void abort() {
ClientConnectionRequest localRequest;
ConnectionReleaseTrigger localTrigger;
this.abortLock.lock();
private void cleanup() {
if (this.connRequest != null) {
this.connRequest.abortRequest();
this.connRequest = null;
}
if (this.releaseTrigger != null) {
try {
this.releaseTrigger.abortConnection();
} catch (IOException ex) {
}
this.releaseTrigger = null;
}
}
public void abort() {
if (this.aborted) {
return;
}
this.abortLock.lock();
try {
this.aborted = true;
localRequest = connRequest;
localTrigger = releaseTrigger;
cleanup();
} finally {
this.abortLock.unlock();
}
// Trigger the callbacks outside of the lock, to prevent
// deadlocks in the scenario where the callbacks have
// their own locks that may be used while calling
// setReleaseTrigger or setConnectionRequest.
if (localRequest != null) {
localRequest.abortRequest();
}
if (localTrigger != null) {
try {
localTrigger.abortConnection();
} catch (IOException ex) {
// ignore
}
}
}
public boolean isAborted() {
return this.aborted;
}
/**
* Resets internal state of the request making it reusable.
*
* @since 4.2
*/
public void reset() {
this.abortLock.lock();
try {
cleanup();
this.aborted = false;
} finally {
this.abortLock.unlock();
}
}
/**
* A convenience method to simplify migration from HttpClient 3.1 API. This method is
* equivalent to {@link #reset()}.
*
* @since 4.2
*/
public void releaseConnection() {
reset();
}
@Override
public Object clone() throws CloneNotSupportedException {
HttpRequestBase clone = (HttpRequestBase) super.clone();