aboutsummaryrefslogtreecommitdiff
path: root/libjava
diff options
context:
space:
mode:
authorDavid Daney <ddaney@avtrex.com>2004-11-17 23:51:18 +0000
committerDavid Daney <daney@gcc.gnu.org>2004-11-17 23:51:18 +0000
commit188cd44d12042e6d31dac15de2dd720db5808820 (patch)
tree9bec7447c031badb4777eef829231ddd27118a4f /libjava
parent07d05ffdacf03e30bc013c814366295a9a32f9d7 (diff)
downloadgcc-188cd44d12042e6d31dac15de2dd720db5808820.zip
gcc-188cd44d12042e6d31dac15de2dd720db5808820.tar.gz
gcc-188cd44d12042e6d31dac15de2dd720db5808820.tar.bz2
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
Diffstat (limited to 'libjava')
-rw-r--r--libjava/ChangeLog4
-rw-r--r--libjava/java/io/BufferedInputStream.java2
2 files changed, 5 insertions, 1 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index e659b42..0bb44d7 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 17c570f..27fc4b7 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;