Author: sebb
Date: Tue Feb 24 14:39:59 2009
New Revision: 747397
URL: http://svn.apache.org/viewvc?rev=747397&view=rev
Log:
Copy actual encoding; simplify file uri usage
Modified:
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
Modified:
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java?rev=747397&r1=747396&r2=747397&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
Tue Feb 24 14:39:59 2009
@@ -1028,14 +1028,14 @@
private HTTPSampleResult fileSample(URI uri) throws IOException {
- String urlStr = uri.toString();
+ //String urlStr = uri.toString();
HTTPSampleResult res = new HTTPSampleResult();
res.setMonitor(isMonitor());
res.setHTTPMethod(GET); // Dummy
- res.setURL(new URL(urlStr));
- res.setSampleLabel(urlStr);
+ res.setURL(uri.toURL());
+ res.setSampleLabel(uri.toString());
FileReader reader = null;
res.sampleStart();
try {
@@ -1341,7 +1341,7 @@
totalRes.setDataType(lastRes.getDataType());
totalRes.setResponseHeaders(lastRes.getResponseHeaders());
totalRes.setContentType(lastRes.getContentType());
- totalRes.setDataEncoding(lastRes.getDataEncoding());
+ totalRes.setDataEncoding(lastRes.getDataEncodingNoDefault());
return totalRes;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
