Author: sebb
Date: Wed Sep 5 13:06:31 2007
New Revision: 573042
URL: http://svn.apache.org/viewvc?rev=573042&view=rev
Log:
Fix NPE in SampleResultConverter - XStream PrettyPrinteWriter cannot handle
nulls
Modified:
jakarta/jmeter/branches/rel-2-2/docs/changes.html
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/converters/ConversionHelp.java
jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml
Modified: jakarta/jmeter/branches/rel-2-2/docs/changes.html
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/docs/changes.html?rev=573042&r1=573041&r2=573042&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/docs/changes.html (original)
+++ jakarta/jmeter/branches/rel-2-2/docs/changes.html Wed Sep 5 13:06:31 2007
@@ -131,9 +131,24 @@
</b>
</p>
<h3 >
- Version 2.31
+ Version 2.3
+ </h3>
+
<h3 >
+ Fixes since
2.3RC4
</h3>
<h4 >
+ Bug fixes
+ </h4>
+
<ul >
+
+
+
<li >
+ Fix NPE in
SampleResultConverter - XStream PrettyPrinteWriter cannot handle nulls
+ </li>
+
+
+ </ul>
+
<h4 >
Improvements
</h4>
<ul >
@@ -150,15 +165,6 @@
</ul>
-
<h4 >
- Bug fixes
- </h4>
-
<h4 >
-
Incompatibilities
- </h4>
-
<h3 >
- Version 2.3
- </h3>
<h4 >
Fixes since
2.3RC3
</h4>
Modified:
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/converters/ConversionHelp.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/converters/ConversionHelp.java?rev=573042&r1=573041&r2=573042&view=diff
==============================================================================
---
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/converters/ConversionHelp.java
(original)
+++
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/save/converters/ConversionHelp.java
Wed Sep 5 13:06:31 2007
@@ -36,7 +36,7 @@
import com.thoughtworks.xstream.io.HierarchicalStreamWriter;
/**
- * @author mstover
+ * Utility conversion routines for use with XStream
*
*/
public class ConversionHelp {
@@ -72,13 +72,21 @@
outVersion = v;
}
+ /**
+ * Encode a string (if necessary) for output to a JTL file.
+ * Strings are only encoded if the output version is 1.0,
+ * but nulls are always converted to the empty string.
+ *
+ * @param p string to encode
+ * @return encoded string (will never be null)
+ */
public static String encode(String p) {
+ if (p == null) {// Nulls cannot be written using
PrettyPrintWriter - they cause an NPE
+ return ""; // $NON-NLS-1$
+ }
+ // Only encode strings if outVersion = 1.0
if (!"1.0".equals(outVersion))//$NON-NLS-1$
return p;
- // Only encode strings if inVersion = 1.0
- if (p == null) {
- return "";
- }
try {
String p1 = URLEncoder.encode(p, CHAR_SET);
return p1;
Modified: jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml?rev=573042&r1=573041&r2=573042&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml (original)
+++ jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml Wed Sep 5 13:06:31 2007
@@ -27,19 +27,20 @@
<!-- =================== -->
-<h3>Version 2.31</h3>
+<h3>Version 2.3</h3>
+
+<h3>Fixes since 2.3RC4</h3>
+
+<h4>Bug fixes</h4>
+<ul>
+<li>Fix NPE in SampleResultConverter - XStream PrettyPrinteWriter cannot
handle nulls</li>
+</ul>
<h4>Improvements</h4>
<ul>
<li>Add nameSpace option to XPath extractor</li>
<li>Add NULL parameter option to JDBC sampler</li>
</ul>
-
-<h4>Bug fixes</h4>
-
-<h4>Incompatibilities</h4>
-
-<h3>Version 2.3</h3>
<h4>Fixes since 2.3RC3</h4>
<ul>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
