sebb 2005/10/14 10:56:56
Modified: src/core/org/apache/jmeter/samplers Tag: rel-2-1
SampleResult.java
Log:
Avoid NPE in XStream - ensure dataType does not default to null
Revision Changes Path
No revision
No revision
1.40.2.1 +2 -1
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.40
retrieving revision 1.40.2.1
diff -u -r1.40 -r1.40.2.1
--- SampleResult.java 12 Jul 2005 20:50:56 -0000 1.40
+++ SampleResult.java 14 Oct 2005 17:56:55 -0000 1.40.2.1
@@ -121,7 +121,7 @@
private List subResults;
- private String dataType;
+ private String dataType=""; // Don't return null if not set
private boolean success;
@@ -129,6 +129,7 @@
private String dataEncoding;// (is this really the character set?) e.g.
// ISO-8895-1,
UTF-8
+ // If null, then DEFAULT_ENCODING is returned by getDataEncoding()
private long time = 0;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
