Commit 808ce120 by Urban Widmark Committed by Warren Levy

DataInputStream.java (readLine): Corrected handling of empty lines, from null to "".

1999-04-12  Urban Widmark <urban@svenskatest.se>
	* java/io/DataInputStream.java (readLine): Corrected handling of
	empty lines, from null to "".

From-SVN: r26381
parent edcc5d3c
1999-04-12 Urban Widmark <urban@svenskatest.se>
* java/io/DataInputStream.java (readLine): Corrected handling of
empty lines, from null to "".
1999-04-12 Tom Tromey <tromey@cygnus.com>
* Makefile.in: Rebuilt.
......
......@@ -105,8 +105,11 @@ public class DataInputStream extends FilterInputStream implements DataInput
while (true)
{
char ch = (char) read();
if (ch < 0 || (ch &= 0xFF) == '\n')
int c = read();
if (c < 0) // got an EOF
return strb.length() > 0 ? strb.toString() : null;
char ch = (char) c;
if ((ch &= 0xFF) == '\n')
break;
if (ch == '\r')
{
......@@ -148,7 +151,7 @@ public class DataInputStream extends FilterInputStream implements DataInput
strb.append(ch);
}
return strb.length() > 0 ? strb.toString() : null;
return strb.length() > 0 ? strb.toString() : "";
}
public final long readLong() throws IOException
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment