From 920be544c9470f7606623a82b1ca8b5ace4d58cd Mon Sep 17 00:00:00 2001 From: Guilhem Lavaux Date: Sun, 28 Dec 2003 11:54:17 +0000 Subject: 2003-12-28 Guilhem Lavaux * java/io/LineNumberReader.java (mark): Improved error checking. (read): Likewise. (skip): Likewise. Skip is now really eating the specified number of characters. * java/io/CharArrayReader.java (read): It should throw IndexOutOfBoundsException and not ArrayIndexOutOfBoundsException (see mauve). * java/io/BufferedReader.java (readLine): Make readLine() really block until either EOF is reached or a true error happens. From-SVN: r75180 --- libjava/java/io/BufferedReader.java | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'libjava/java/io/BufferedReader.java') diff --git a/libjava/java/io/BufferedReader.java b/libjava/java/io/BufferedReader.java index 73fb47c5d34..e29c8dd8844 100644 --- a/libjava/java/io/BufferedReader.java +++ b/libjava/java/io/BufferedReader.java @@ -460,12 +460,19 @@ public class BufferedReader extends Reader boolean eof = false; for (;;) { - int ch = read(); - if (ch < 0) + // readLine should block. So we must not return until a -1 is reached. + if (pos >= limit) { - eof = true; - break; + // here count == 0 isn't sufficient to give a failure. + int count = fill(); + if (count < 0) + { + eof = true; + break; + } + continue; } + int ch = buffer[pos++]; if (ch == '\n' || ch == '\r') { // Check here if a '\r' was the last char in the buffer; if so, -- cgit v1.2.3