diff options
Diffstat (limited to 'libjava/java/io/BufferedReader.java')
| -rw-r--r-- | libjava/java/io/BufferedReader.java | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/libjava/java/io/BufferedReader.java b/libjava/java/io/BufferedReader.java index 73fb47c..e29c8dd 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, |