Fix for issue reported in SANDBOX-218: CSV reader doesn't handle older Mac line endings (\r) that are also used by recent versions of Excel for Mac.

git-svn-id: https://svn.apache.org/repos/asf/commons/sandbox/csv/trunk@1065496 13f79535-47bb-0310-9956-ffa450edef68

Author: jacopoc

src/java/org/apache/commons/csv/CSVParser.java

@@ -322,6 +322,7 @@ protected Token nextToken(Token tkn) throws IOException {
     //  empty line detection: eol AND (last char was EOL or beginning)
     while (strategy.getIgnoreEmptyLines() && eol 
       && (lastChar == '\n' 
+      || lastChar == '\r' 
       || lastChar == ExtendedBufferedReader.UNDEFINED) 
       && !isEndOfFile(lastChar)) {
       // go on char ahead ...
@@ -580,7 +581,7 @@ private boolean isWhitespace(int c) {
   }
 
   /**
-   * Greedy - accepts \n and \r\n 
+   * Greedy - accepts \n, \r and \r\n 
    * This checker consumes silently the second control-character...
    * 
    * @return true if the given character is a line-terminator
@@ -593,7 +594,7 @@ private boolean isEndOfLine(int c) throws IOException {
         c = in.read();
       }
     }
-    return (c == '\n');
+    return (c == '\n' || c == '\r');
   }
 
   /**