mstover1 2002/07/23 11:41:09
Modified: src_1/org/apache/jmeter/protocol/http/proxy
HttpRequestHdr.java ProxyControl.java
Log:
HTTP proxy using defaults in test tree
Revision Changes Path
1.14 +3 -2
jakarta-jmeter/src_1/org/apache/jmeter/protocol/http/proxy/HttpRequestHdr.java
Index: HttpRequestHdr.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/protocol/http/proxy/HttpRequestHdr.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- HttpRequestHdr.java 21 Jun 2002 02:56:30 -0000 1.13
+++ HttpRequestHdr.java 23 Jul 2002 18:41:08 -0000 1.14
@@ -162,6 +162,7 @@
tempGui.configure(createUrlConfig());
HTTPSampler result = (HTTPSampler)tempGui.createTestElement();
result.setFollowRedirects(false);
+ result.setUseKeepAlive(true);
return result;
}
1.4 +29 -17
jakarta-jmeter/src_1/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
Index: ProxyControl.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/protocol/http/proxy/ProxyControl.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ProxyControl.java 28 Apr 2002 21:40:53 -0000 1.3
+++ ProxyControl.java 23 Jul 2002 18:41:08 -0000 1.4
@@ -328,25 +328,13 @@
JMeterGUIComponent sample =
(JMeterGUIComponent)subNode.getUserObject();
if(sample instanceof UrlConfigGui)
{
+ urlConfig = sample.createTestElement();
+ break;
}
}
- if(urlConfig == null ||
(urlConfig.getProperty(HTTPSampler.DOMAIN) == null ||
-
urlConfig.getProperty(HTTPSampler.DOMAIN).equals("") ||
-
urlConfig.getProperty(HTTPSampler.DOMAIN).equals(sampler.getDomain())) &&
- (urlConfig.getProperty(HTTPSampler.PATH) ==
null ||
-
urlConfig.getProperty(HTTPSampler.PATH).equals("/") ||
-
urlConfig.getProperty(HTTPSampler.PATH).equals(sampler.getPath())))
+ if(areMatched(sampler, urlConfig))
{
- if(urlConfig != null &&
urlConfig.getProperty(HTTPSampler.DOMAIN) != null &&
-
!urlConfig.getProperty(HTTPSampler.DOMAIN).equals(""))
- {
- sampler.setDomain("");
- }
- if(urlConfig != null &&
urlConfig.getProperty(HTTPSampler.PATH) != null &&
-
!urlConfig.getProperty(HTTPSampler.PATH).equals("/"))
- {
- sampler.setPath("");
- }
+ removeValuesFromSampler(sampler, urlConfig);
HttpTestSampleGui test = new HttpTestSampleGui();
test.configure(sampler);
try
@@ -369,6 +357,30 @@
}
}
}
+ }
+
+ private void removeValuesFromSampler(
+ HTTPSampler sampler,
+ TestElement urlConfig) {
+ if(urlConfig != null && urlConfig.getProperty(HTTPSampler.DOMAIN) !=
null &&
+ !urlConfig.getProperty(HTTPSampler.DOMAIN).equals(""))
+ {
+ sampler.setDomain("");
+ }
+ if(urlConfig != null && urlConfig.getProperty(HTTPSampler.PATH) !=
null &&
+ !urlConfig.getProperty(HTTPSampler.PATH).equals("/"))
+ {
+ sampler.setPath("");
+ }
+ }
+
+ private boolean areMatched(HTTPSampler sampler, TestElement urlConfig) {
+ return urlConfig == null || (urlConfig.getProperty(HTTPSampler.DOMAIN)
== null ||
+ urlConfig.getProperty(HTTPSampler.DOMAIN).equals("") ||
+
urlConfig.getProperty(HTTPSampler.DOMAIN).equals(sampler.getDomain())) &&
+ (urlConfig.getProperty(HTTPSampler.PATH) == null ||
+ urlConfig.getProperty(HTTPSampler.PATH).equals("") ||
+
urlConfig.getProperty(HTTPSampler.PATH).equals(sampler.getPath()));
}
private boolean checkIncludes(HTTPSampler sampler)
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
