X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=basic%2Fruntime%2Forg.argeo.basic.nodeps%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Futil%2FCsvParser.java;fp=basic%2Fruntime%2Forg.argeo.basic.nodeps%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Futil%2FCsvParser.java;h=c20f4e07c684c90902cef9fd473e16410286d64f;hb=7215a19b3ee12587e9d8298c9afd576bf087b017;hp=9acbfe246ce07ec67da94721fa25b7c23a5e7a9e;hpb=63906e5a538b4595e1696fee927d647df1dab1b1;p=lgpl%2Fargeo-commons.git

diff --git a/basic/runtime/org.argeo.basic.nodeps/src/main/java/org/argeo/util/CsvParser.java b/basic/runtime/org.argeo.basic.nodeps/src/main/java/org/argeo/util/CsvParser.java
index 9acbfe246..c20f4e07c 100644
--- a/basic/runtime/org.argeo.basic.nodeps/src/main/java/org/argeo/util/CsvParser.java
+++ b/basic/runtime/org.argeo.basic.nodeps/src/main/java/org/argeo/util/CsvParser.java
@@ -29,12 +29,12 @@ public abstract class CsvParser {
 	 * 
 	 * @param lineNumber
 	 *            the current line number, starts at 1 (the header, if header
-	 *            processing is enabled, the first lien otherwise)
+	 *            processing is enabled, the first line otherwise)
 	 * @param header
 	 *            the read-only header or null if {@link #setNoHeader(Boolean)}
 	 *            is true (default is false)
 	 * @param tokens
-	 *            the parse tokens
+	 *            the parsed tokens
 	 */
 	protected abstract void processLine(Integer lineNumber,
 			List<String> header, List<String> tokens);
@@ -55,6 +55,9 @@ public abstract class CsvParser {
 				StringBuffer currStr = new StringBuffer("");
 				Boolean wasInquote = false;
 				while (parseLine(headerStr, header, currStr, wasInquote)) {
+					headerStr = reader.readLine();
+					if (headerStr == null)
+						break;
 					wasInquote = true;
 				}
 				header = Collections.unmodifiableList(header);
@@ -124,7 +127,7 @@ public abstract class CsvParser {
 			if (c == separator) {
 				if (!inQuote) {
 					tokens.add(currStr.toString());
-					//System.out.println("# TOKEN: " + currStr);
+					// System.out.println("# TOKEN: " + currStr);
 					currStr.delete(0, currStr.length());
 				} else {
 					// we don't remove separator that are in a quoted substring