OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

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

From-SVN: r26381
This commit is contained in:
Urban Widmark 1999-04-12 20:27:56 +02:00 committed by Warren Levy
parent edcc5d3c96
commit 808ce120ae
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libjava/ChangeLog
View File

@ -1,3 +1,8 @@
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> 1999-04-12 Tom Tromey <tromey@cygnus.com>
* Makefile.in: Rebuilt. * Makefile.in: Rebuilt.

9
libjava/java/io/DataInputStream.java
View File

@ -105,8 +105,11 @@ public class DataInputStream extends FilterInputStream implements DataInput
while (true) while (true)
{ {
char ch = (char) read(); int c = read();
if (ch < 0 || (ch &= 0xFF) == '\n') if (c < 0) // got an EOF
return strb.length() > 0 ? strb.toString() : null;
char ch = (char) c;
if ((ch &= 0xFF) == '\n')
break; break;
if (ch == '\r') if (ch == '\r')
{ {
@ -148,7 +151,7 @@ public class DataInputStream extends FilterInputStream implements DataInput
strb.append(ch); strb.append(ch);
} }
return strb.length() > 0 ? strb.toString() : null; return strb.length() > 0 ? strb.toString() : "";
} }
public final long readLong() throws IOException public final long readLong() throws IOException