Author: sebb
Date: Tue Nov 4 04:05:30 2008
New Revision: 711236
URL: http://svn.apache.org/viewvc?rev=711236&view=rev
Log:
Check for EOF within quoted string
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/CSVSaveService.java
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/CSVSaveService.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/CSVSaveService.java?rev=711236&r1=711235&r2=711236&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/CSVSaveService.java
(original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/CSVSaveService.java
Tue Nov 4 04:05:30 2008
@@ -965,7 +965,7 @@
throw new IOException("Cannot have single quote-char in
quoted field:["+baos.toString()+"]");
}
break;
- }
+ } // switch(state)
if (push) {
if (ch == '\r') {// Remove following \n if present
infile.mark(1);
@@ -980,9 +980,14 @@
if ((ch == '\n' || ch == '\r') && state != QUOTED) {
break;
}
- }
- if (ch == -1 && baos.size() > 0){
- list.add(baos.toString());
+ } // while not EOF
+ if (ch == -1){
+ if (state == QUOTED){
+ throw new IOException(state+" Missing trailing quote-char in
quoted field:[\""+baos.toString()+"]");
+ }
+ if (baos.size() > 0) {
+ list.add(baos.toString());
+ }
}
return (String[]) list.toArray(new String[]{});
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
