Author: sebb
Date: Tue Dec 7 14:44:11 2010
New Revision: 1043068
URL: http://svn.apache.org/viewvc?rev=1043068&view=rev
Log:
Tidy proxy setup code
Modified:
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC3Impl.java
Modified:
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC3Impl.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC3Impl.java?rev=1043068&r1=1043067&r2=1043068&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC3Impl.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC3Impl.java
Tue Dec 7 14:44:11 2010
@@ -392,22 +392,20 @@ public class HTTPHC3Impl extends HTTPHCA
}
}
- boolean useStaticProxy = PROXY_DEFINED && !isNonProxy(host);
- boolean useDynamicProxy = false;
-
final String proxyHost = getProxyHost();
final int proxyPort = getProxyPortInt();
- if (proxyHost.length() > 0 && proxyPort > 0){
+
+ boolean useStaticProxy = isStaticProxy(host);
+ boolean useDynamicProxy = isDynamicProxy(proxyHost, proxyPort);
+
+ if (useDynamicProxy){
hc.setProxy(proxyHost, proxyPort);
useStaticProxy = false; // Dynamic proxy overrules static proxy
- useDynamicProxy = true;
- } else {
- if (useStaticProxy) {
- if (log.isDebugEnabled()){
- log.debug("Setting proxy: "+PROXY_HOST+":"+PROXY_PORT);
- }
- hc.setProxy(PROXY_HOST, PROXY_PORT);
+ } else if (useStaticProxy) {
+ if (log.isDebugEnabled()){
+ log.debug("Setting proxy: "+PROXY_HOST+":"+PROXY_PORT);
}
+ hc.setProxy(PROXY_HOST, PROXY_PORT);
}
Map<HostConfiguration, HttpClient> map = httpClients.get();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
