diff options
| author | Tom Tromey <tromey@cygnus.com> | 1999-05-10 12:33:07 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 1999-05-10 12:33:07 +0000 |
| commit | 9733e4ee3172af5cf90267abf4a9ce8e082c058b (patch) | |
| tree | 1f3955d0c2dba39eb67bebb27fc42978c9289425 /libjava/java/io | |
| parent | 05e0b2f47cf953ec7db7d9dede697420c9e48748 (diff) | |
| download | gcc-9733e4ee3172af5cf90267abf4a9ce8e082c058b.zip gcc-9733e4ee3172af5cf90267abf4a9ce8e082c058b.tar.gz gcc-9733e4ee3172af5cf90267abf4a9ce8e082c058b.tar.bz2 | |
InputStreamReader.java (read): If length is 0, return 0.
* java/io/InputStreamReader.java (read): If length is 0, return
0. Reset `wpos' and `wcount' when buffer has been filled and
emptied.
* java/util/Properties.java (save): Removed `FIXME' comment.
(load): Invalid characters in \u now treated as terminators.
Make sure to append character resulting from `\' handling.
Cast to `char' when appending to key or value.
(skip_ws): Inverted test for whitespace.
From-SVN: r26862
Diffstat (limited to 'libjava/java/io')
| -rw-r--r-- | libjava/java/io/InputStreamReader.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/libjava/java/io/InputStreamReader.java b/libjava/java/io/InputStreamReader.java index 5d37303..ae5e2c7 100644 --- a/libjava/java/io/InputStreamReader.java +++ b/libjava/java/io/InputStreamReader.java @@ -111,6 +111,8 @@ public class InputStreamReader extends Reader } else { + if (length == 0) + return 0; for (;;) { in.mark(1); @@ -141,6 +143,11 @@ public class InputStreamReader extends Reader wpos = 0; wcount = 0; } + else if (wavail == 0) + { + wpos = 0; + wcount = 0; + } int count = read(work, wpos, work.length-wpos); if (count <= 0) return -1; |