sebb 2005/10/16 16:34:12
Modified: src/core/org/apache/jmeter/reporters Tag: rel-2-1
ResultCollector.java
Log:
Remove <?xml prefix when running Java 1.5 without the x-jars
Revision Changes Path
No revision
No revision
1.53.2.2 +14 -3
jakarta-jmeter/src/core/org/apache/jmeter/reporters/ResultCollector.java
Index: ResultCollector.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/reporters/ResultCollector.java,v
retrieving revision 1.53.2.1
retrieving revision 1.53.2.2
diff -u -r1.53.2.1 -r1.53.2.2
--- ResultCollector.java 15 Sep 2005 23:17:57 -0000 1.53.2.1
+++ ResultCollector.java 16 Oct 2005 23:34:12 -0000 1.53.2.2
@@ -420,10 +420,21 @@
serializer.serialize(tempOut,
OldSaveService.getConfiguration(result, getSaveConfig()));
String serVer = tempOut.toString();
- int index =
serVer.indexOf(System.getProperty("line.separator"));
- if (index > -1) {
+ String lineSep=System.getProperty("line.separator");
+ /*
+ * Remove the <?xml ... ?> prefix.
+ * When using the x-jars (xakan etc) or Java 1.4, the serialised
output has a
+ * newline after the prefix. However, when using Java 1.5 without
the x-jars, the output
+ * has no newline at all.
+ */
+ int index = serVer.indexOf(lineSep); // Is there a new-line?
+ if (index > -1) {// Yes, assume it follows the prefix
return serVer.substring(index);
- } else {
+ } else { // no new-line; check for prefix and repace with
new-line
+ if (serVer.startsWith("<?xml")){
+ index=serVer.indexOf("?>");// must exist
+ return lineSep + serVer.substring(index+2);// +2 for ?>
+ }
return serVer;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
