sebb 2005/03/12 03:38:40
Modified: src/core/org/apache/jmeter/samplers Tag: rel-2_0
SampleResult.java
bin Tag: rel-2_0 jmeter.properties
Log:
Bug 33196 - encoding ISO-8859-1 is only suitable for Western countries
Revision Changes Path
No revision
No revision
1.29.2.7 +11 -4
jakarta-jmeter/src/core/org/apache/jmeter/samplers/SampleResult.java
Index: SampleResult.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/samplers/SampleResult.java,v
retrieving revision 1.29.2.6
retrieving revision 1.29.2.7
diff -u -r1.29.2.6 -r1.29.2.7
--- SampleResult.java 12 Dec 2004 23:33:13 -0000 1.29.2.6
+++ SampleResult.java 12 Mar 2005 11:38:39 -0000 1.29.2.7
@@ -46,7 +46,13 @@
*/
public class SampleResult implements Serializable
{
- /**
+ // Bug 33196 - encoding ISO-8859-1 is only suitable for Western
countries
+ // However the suggested System.getProperty("file.encoding") is Cp1252
on Windows
+ // So use a new property with the original value as default
+ private static final String DEFAULT_ENCODING =
+
JMeterUtils.getPropDefault("sampleresult.default.encoding","ISO-8859-1");
+
+ /**
* Data type value indicating that the response data is text.
*
* @see #getDataType
@@ -106,6 +112,7 @@
} else {
log.info("Note: Sample TimeStamps are END times");
}
+ log.info("sampleresult.default.encoding is set to
"+DEFAULT_ENCODING);
}
public SampleResult()
{
@@ -429,7 +436,7 @@
}
else
{
- return "ISO-8859-1";// 8859-1 is not a valid Java data encoding
..
+ return DEFAULT_ENCODING;
}
}
No revision
No revision
1.100.2.12 +4 -1 jakarta-jmeter/bin/jmeter.properties
Index: jmeter.properties
===================================================================
RCS file: /home/cvs/jakarta-jmeter/bin/jmeter.properties,v
retrieving revision 1.100.2.11
retrieving revision 1.100.2.12
diff -u -r1.100.2.11 -r1.100.2.12
--- jmeter.properties 5 Mar 2005 13:20:11 -0000 1.100.2.11
+++ jmeter.properties 12 Mar 2005 11:38:40 -0000 1.100.2.12
@@ -237,6 +237,9 @@
# Put the start time stamp in logs instead of the end
#sampleresult.timestamp.start=true
+# The encoding to be used if none is provided (default ISO-8859-1)
+#sampleresult.default.encoding=ISO-8859-1
+
# Remote Listener settings
# if hold_samples = true then samples are held at the server until the end
of a test run
#hold_samples=true
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
