procyberian/gcc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

2003-12-28 Guilhem Lavaux <guilhem@kaffe.org>

Browse source 
* 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
This commit is contained in:
Guilhem Lavaux 2003-12-28 11:54:17 +00:00 • committed by Michael Koch
parent 07dc48e014
commit 920be544c9
4 changed files with 42 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

15
libjava/java/io/BufferedReader.java
View file

@ -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,