sebb 2004/04/26 10:47:33
Modified: src/core/org/apache/jmeter/reporters Tag: rel-2_0
ResultSaver.java
Log:
Bug 28564: fixed makeFileName to handle null and mixed contentType
Revision Changes Path
No revision
No revision
1.4.2.1 +17 -8
jakarta-jmeter/src/core/org/apache/jmeter/reporters/ResultSaver.java
Index: ResultSaver.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/reporters/ResultSaver.java,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- ResultSaver.java 30 Mar 2004 18:08:09 -0000 1.4
+++ ResultSaver.java 26 Apr 2004 17:47:33 -0000 1.4.2.1
@@ -131,14 +131,23 @@
/**
* @return fileName composed of fixed prefix, a number,
* and a suffix derived from the contentType
+ * e.g. Content-Type: text/html;charset=ISO-8859-1
*/
private String makeFileName(String contentType) {
- String suffix;
- int i = contentType.indexOf("/");
- if (i == -1){
- suffix="unknown";
- } else {
- suffix=contentType.substring(i+1);
+ String suffix="unknown";
+ if (contentType!=null){
+ int i = contentType.indexOf("/");
+ if (i != -1){
+ int j = contentType.indexOf(";");
+ if (j != -1)
+ {
+ suffix=contentType.substring(i+1,j);
+ }
+ else
+ {
+ suffix=contentType.substring(i+1);
+ }
+ }
}
return getFilename()+sequenceNumber+"."+suffix;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
