Author: sebb
Date: Fri Sep 23 23:24:18 2011
New Revision: 1175069
URL: http://svn.apache.org/viewvc?rev=1175069&view=rev
Log:
Temporary hack to work round
https://issues.apache.org/jira/browse/HTTPCLIENT-1120
Note: copying the code from the patch did not seem to work; it looks like
isAborted() was not set.
Hopefully that is fixed in 4.1.3
Modified:
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java
Modified:
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java?rev=1175069&r1=1175068&r2=1175069&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java
Fri Sep 23 23:24:18 2011
@@ -456,7 +456,17 @@ public class HTTPHC4Impl extends HTTPHCA
httpClient = new DefaultHttpClient(clientParams){
@Override
protected HttpRequestRetryHandler
createHttpRequestRetryHandler() {
- return new DefaultHttpRequestRetryHandler(RETRY_COUNT,
false); // set retry count
+ return new DefaultHttpRequestRetryHandler(RETRY_COUNT,
false) {
+ // TODO HACK to fix
https://issues.apache.org/jira/browse/HTTPCLIENT-1120
+ // can hopefully be removed when 4.1.3 or 4.2 are
released
+ @Override
+ public boolean retryRequest(IOException ex, int count,
HttpContext ctx) {
+ if (interrupted) {
+ return false;
+ }
+ return super.retryRequest(ex, count, ctx);
+ }
+ }; // set retry count
}
};
((AbstractHttpClient) httpClient).addResponseInterceptor(new
ResponseContentEncoding());
@@ -1065,7 +1075,11 @@ public class HTTPHC4Impl extends HTTPHCA
}
}
+ // TODO HACK to fix https://issues.apache.org/jira/browse/HTTPCLIENT-1120
+ private volatile boolean interrupted = false;
+
public boolean interrupt() {
+ interrupted = true;
HttpUriRequest request = currentRequest;
if (request != null) {
currentRequest = null;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
