prevent blocking on lookahead after EOL: SANDBOX-173

yonik · yonik · commit 3c08f7a5c47f · 2007-01-30T20:29:06.000Z
git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/sandbox/csv/trunk@501543 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/java/org/apache/commons/csv/ExtendedBufferedReader.java b/src/java/org/apache/commons/csv/ExtendedBufferedReader.java
@@ -81,7 +81,11 @@ public int read() throws IOException {
       lookaheadChar = super.read();
     }
     lastChar = lookaheadChar;
-    lookaheadChar = super.read();
+    if (super.ready()) {
+      lookaheadChar = super.read();
+    } else {
+      lookaheadChar = UNDEFINED;
+    }
     if (lastChar == '\n') {
       lineCounter++;
     } 

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,11 @@ public int read() throws IOException {`
`81`	`81`	`lookaheadChar = super.read();`
`82`	`82`	`}`
`83`	`83`	`lastChar = lookaheadChar;`
`84`		`- lookaheadChar = super.read();`
	`84`	`+ if (super.ready()) {`
	`85`	`+ lookaheadChar = super.read();`
	`86`	`+ } else {`
	`87`	`+ lookaheadChar = UNDEFINED;`
	`88`	`+ }`
`85`	`89`	`if (lastChar == '\n') {`
`86`	`90`	`lineCounter++;`
`87`	`91`	`}`