diff options
| author | Urban Widmark <urban@svenskatest.se> | 1999-04-12 20:27:56 +0200 |
|---|---|---|
| committer | Warren Levy <warrenl@gcc.gnu.org> | 1999-04-12 18:27:56 +0000 |
| commit | 808ce120ae43633728dd0346abe2c09707b22f27 (patch) | |
| tree | 10f345ed74fb3dd64c6be39b0400d96c84f34093 | |
| parent | edcc5d3c96b30e46c15f37295646ce68cf0f563c (diff) | |
| download | gcc-808ce120ae43633728dd0346abe2c09707b22f27.zip gcc-808ce120ae43633728dd0346abe2c09707b22f27.tar.gz gcc-808ce120ae43633728dd0346abe2c09707b22f27.tar.bz2 | |
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
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/java/io/DataInputStream.java | 9 |
2 files changed, 11 insertions, 3 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 3beb48c..9b8323a 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -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> * Makefile.in: Rebuilt. diff --git a/libjava/java/io/DataInputStream.java b/libjava/java/io/DataInputStream.java index 7c90008..d03f8f4 100644 --- a/libjava/java/io/DataInputStream.java +++ b/libjava/java/io/DataInputStream.java @@ -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 |