diff options
| author | daney <daney@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-11-17 23:51:18 +0000 |
|---|---|---|
| committer | daney <daney@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-11-17 23:51:18 +0000 |
| commit | 3c4044e982dc260ba62c473ce6ea58fb77cd9e24 (patch) | |
| tree | 9bec7447c031badb4777eef829231ddd27118a4f /libjava | |
| parent | 0e0971c012373e31ba0e4d8c9ab05a009cdbd17e (diff) | |
| download | ppe42-gcc-3c4044e982dc260ba62c473ce6ea58fb77cd9e24.tar.gz ppe42-gcc-3c4044e982dc260ba62c473ce6ea58fb77cd9e24.zip | |
2004-11-17 David Daney <ddaney@avtrex.com>
* java/io/BufferedInputStream.java (skip): Return zero on EOF.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@90832 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 4 | ||||
| -rw-r--r-- | libjava/java/io/BufferedInputStream.java | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index e659b42757d..0bb44d7f66f 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,7 @@ +2004-11-17 David Daney <ddaney@avtrex.com> + + * java/io/BufferedInputStream.java (skip): Return zero on EOF. + 2004-11-17 Michael Koch <konqueror@gmx.de> * java/net/Socket.java (getPort): Return 0 in error case. diff --git a/libjava/java/io/BufferedInputStream.java b/libjava/java/io/BufferedInputStream.java index 17c570f104b..27fc4b7b49d 100644 --- a/libjava/java/io/BufferedInputStream.java +++ b/libjava/java/io/BufferedInputStream.java @@ -321,7 +321,7 @@ public class BufferedInputStream extends FilterInputStream if (n < origN) break; else - return -1; // No bytes were read before EOF. + return 0; // No bytes were read before EOF. int numread = (int) Math.min((long) (count - pos), n); pos += numread; |
