diff options
author | David Daney <ddaney@avtrex.com> | 2004-11-17 23:51:18 +0000 |
---|---|---|
committer | David Daney <daney@gcc.gnu.org> | 2004-11-17 23:51:18 +0000 |
commit | 188cd44d12042e6d31dac15de2dd720db5808820 (patch) | |
tree | 9bec7447c031badb4777eef829231ddd27118a4f | |
parent | 07d05ffdacf03e30bc013c814366295a9a32f9d7 (diff) | |
download | gcc-188cd44d12042e6d31dac15de2dd720db5808820.tar.gz |
BufferedInputStream.java (skip): Return zero on EOF.
2004-11-17 David Daney <ddaney@avtrex.com>
* java/io/BufferedInputStream.java (skip): Return zero on EOF.
From-SVN: r90832
-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; |