Author: sebb Date: Wed Mar 31 02:24:29 2010 New Revision: 929364 URL: http://svn.apache.org/viewvc?rev=929364&view=rev Log: Bug 43678 - Handle META tag http-equiv charset?
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampleResult.java jakarta/jmeter/trunk/xdocs/changes.xml Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java?rev=929364&r1=929363&r2=929364&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java (original) +++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java Wed Mar 31 02:24:29 2010 @@ -691,14 +691,25 @@ public class SampleResult implements Ser } /** - * Returns the dataEncoding or the default if no dataEncoding was provided + * Returns the dataEncoding or the default if no dataEncoding was provided. + * * @return the value of the dataEncoding or DEFAULT_ENCODING */ public String getDataEncodingWithDefault() { + return getDataEncodingWithDefault(DEFAULT_ENCODING); + } + + /** + * Returns the dataEncoding or the default if no dataEncoding was provided. + * + * @param defaultEncoding the default to be applied + * @return the value of the dataEncoding or the provided default + */ + protected String getDataEncodingWithDefault(String defaultEncoding) { if (dataEncoding != null && dataEncoding.length() > 0) { return dataEncoding; } - return DEFAULT_ENCODING; + return defaultEncoding; } /** Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampleResult.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampleResult.java?rev=929364&r1=929363&r2=929364&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampleResult.java (original) +++ jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampleResult.java Wed Mar 31 02:24:29 2010 @@ -51,7 +51,6 @@ public class HTTPSampleResult extends Sa public HTTPSampleResult() { super(); - setDataEncoding(DEFAULT_HTTP_ENCODING); // default if encoding not provided be the page } public HTTPSampleResult(long elapsed) { @@ -207,7 +206,7 @@ public class HTTPSampleResult extends Sa } } } - return super.getDataEncodingWithDefault(); + return super.getDataEncodingWithDefault(DEFAULT_HTTP_ENCODING); } public void setResponseNoContent(){ Modified: jakarta/jmeter/trunk/xdocs/changes.xml URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/changes.xml?rev=929364&r1=929363&r2=929364&view=diff ============================================================================== --- jakarta/jmeter/trunk/xdocs/changes.xml (original) +++ jakarta/jmeter/trunk/xdocs/changes.xml Wed Mar 31 02:24:29 2010 @@ -85,6 +85,7 @@ The XPath Assertion and XPath Extractor <li>Bug 48568 - CookieManager broken for AjpSampler</li> <li>Bug 48570 - AjpSampler doesn't support query parameters (GET/POST)</li> <li>Bug 46901 - HTTP Sampler does not process var/func refs correctly in first file parameter</li> +<li>Bug 43678 - Handle META tag http-equiv charset?</li> </ul> <h3>Other Samplers</h3> --------------------------------------------------------------------- To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org