diff options
| author | Tom Tromey <tromey@redhat.com> | 2002-06-15 18:59:15 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2002-06-15 18:59:15 +0000 |
| commit | 34442f32a2407deff70df24c62713044748caf84 (patch) | |
| tree | 1552fa58fe7792b5a7327cb8881602dd3ea5a4aa /libjava/java/io/PushbackInputStream.java | |
| parent | 945dabcd7ac1a6b7aedb28b8e192aec12c601a85 (diff) | |
| download | gcc-34442f32a2407deff70df24c62713044748caf84.zip gcc-34442f32a2407deff70df24c62713044748caf84.tar.gz gcc-34442f32a2407deff70df24c62713044748caf84.tar.bz2 | |
BufferedOutputStream.java: Re-merged with Classpath.
* java/io/BufferedOutputStream.java: Re-merged with Classpath.
* java/io/CharConversionException.java: Likewise.
* java/io/EOFException.java: Likewise.
* java/io/FileNotFoundException.java: Likewise.
* java/io/IOException.java: Likewise.
* java/io/InterruptedIOException.java: Likewise.
* java/io/InvalidClassException.java: Likewise.
* java/io/InvalidObjectException.java: Likewise.
* java/io/NotActiveException.java: Likewise.
* java/io/NotSerializableException.java: Likewise.
* java/io/ObjectStreamException.java: Likewise.
* java/io/ObjectStreamConstants.java: Likewise.
* java/io/OptionalDataException.java: Likewise.
* java/io/PipedInputStream.java: Likewise.
* java/io/PushbackInputStream.java: Likewise.
* java/io/StreamCorruptedException.java: Likewise.
* java/io/SyncFailedException.java: Likewise.
* java/io/UTFDataFormatException.java: Likewise.
* java/io/UnsupportedEncodingException.java: Likewise.
* java/io/WriteAbortedException.java: Likewise.
From-SVN: r54655
Diffstat (limited to 'libjava/java/io/PushbackInputStream.java')
| -rw-r--r-- | libjava/java/io/PushbackInputStream.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libjava/java/io/PushbackInputStream.java b/libjava/java/io/PushbackInputStream.java index ebf0e38..ffc582f 100644 --- a/libjava/java/io/PushbackInputStream.java +++ b/libjava/java/io/PushbackInputStream.java @@ -201,6 +201,7 @@ public class PushbackInputStream extends FilterInputStream public synchronized int read(byte[] b, int off, int len) throws IOException { int numBytes = Math.min(buf.length - pos, len); + if (numBytes > 0) { System.arraycopy (buf, pos, b, off, numBytes); @@ -209,10 +210,10 @@ public class PushbackInputStream extends FilterInputStream off += numBytes; } - if (len > 0) + if (len > 0) { len = super.read(b, off, len); - if (len == -1) // EOF + if (len == -1) //EOF return numBytes > 0 ? numBytes : -1; numBytes += len; } @@ -318,7 +319,8 @@ public class PushbackInputStream extends FilterInputStream int numread = (int) Math.min((long) (buf.length - pos), n); pos += numread; n -= numread; - n -= super.skip(n); + if (n > 0) + n -= super.skip(n); } return origN - n; |