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

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index e659b42757d2a1ad08b3ff12176a0eca5eabb1a8..0bb44d7f66f995a377ad1c3558888d51b8741c90 100644 (file)
--- 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 17c570f104b3f05bd9a766d36488b3729a2a3a37..27fc4b7b49dfe0a526ce128e1ae16d611c3852b6 100644 (file)
--- 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;