Author: sebb Date: Mon Feb 15 13:55:44 2010 New Revision: 910218 URL: http://svn.apache.org/viewvc?rev=910218&view=rev Log: Extract static constant
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java 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=910218&r1=910217&r2=910218&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 Mon Feb 15 13:55:44 2010 @@ -68,6 +68,9 @@ = JMeterUtils.getPropDefault("sampleresult.default.encoding", // $NON-NLS-1$ DEFAULT_HTTP_ENCODING); + /* The default used by {...@link #setResponseData(String, String)} */ + private static final String DEFAULT_CHARSET = Charset.defaultCharset().name(); + /** * Data type value indicating that the response data is text. * @@ -529,16 +532,15 @@ * */ public void setResponseData(final String response, final String encoding) { - String defaultEncodingName = Charset.defaultCharset().name(); - String encodeUsing = encoding != null? encoding : defaultEncodingName; + String encodeUsing = encoding != null? encoding : DEFAULT_CHARSET; try { responseData = response.getBytes(encodeUsing); setDataEncoding(encodeUsing); } catch (UnsupportedEncodingException e) { log.warn("Could not convert string using "+encodeUsing+ - ", using default encoding: "+defaultEncodingName+" "+e.getLocalizedMessage()); + ", using default encoding: "+DEFAULT_CHARSET+" "+e.getLocalizedMessage()); responseData = response.getBytes(); - setDataEncoding(defaultEncodingName); + setDataEncoding(DEFAULT_CHARSET); } } --------------------------------------------------------------------- To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org