* 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

1 files changed, 7 insertions, 0 deletions

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;