From 460fb0a0486c7b8fc34902e4834ff65da18611b8 Mon Sep 17 00:00:00 2001 From: tromey Date: Mon, 10 May 1999 12:33:07 +0000 Subject: * 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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@26862 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/java/io/InputStreamReader.java | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'libjava/java/io/InputStreamReader.java') diff --git a/libjava/java/io/InputStreamReader.java b/libjava/java/io/InputStreamReader.java index 5d37303121b..ae5e2c7b0eb 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; -- cgit v1.2.1