From e42b522040644e919e4da4c9a10edcec01ae847e Mon Sep 17 00:00:00 2001 From: bryce Date: Wed, 29 Nov 2000 10:06:03 +0000 Subject: * java/util/zip/InflaterInputStream (read): Don't return -1 unless the infate() call didn't deliver any output. Throw a ZipException if the needsDictionary() call returns true. * java/io/ByteArrayInputStream (read): Remove redundant bounds checks. * java/io/InputStreamReader: Use the default buffer size for the contained BufferedInputStream. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@37846 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/java/io/ByteArrayInputStream.java | 7 ------- libjava/java/io/InputStreamReader.java | 2 +- 2 files changed, 1 insertion(+), 8 deletions(-) (limited to 'libjava/java/io') diff --git a/libjava/java/io/ByteArrayInputStream.java b/libjava/java/io/ByteArrayInputStream.java index 97ec6e79818..30ba8d7f9da 100644 --- a/libjava/java/io/ByteArrayInputStream.java +++ b/libjava/java/io/ByteArrayInputStream.java @@ -72,9 +72,6 @@ public class ByteArrayInputStream extends InputStream public synchronized int read() { - if (pos < 0) - throw new ArrayIndexOutOfBoundsException(pos); - if (pos < count) return ((int) buf[pos++]) & 0xFF; return -1; @@ -82,10 +79,6 @@ public class ByteArrayInputStream extends InputStream public synchronized int read(byte[] b, int off, int len) { - /* Don't need to check pos value, arraycopy will check it. */ - if (off < 0 || len < 0 || off + len > b.length) - throw new ArrayIndexOutOfBoundsException(); - if (pos >= count) return -1; diff --git a/libjava/java/io/InputStreamReader.java b/libjava/java/io/InputStreamReader.java index 478d8ef5996..73876fbd691 100644 --- a/libjava/java/io/InputStreamReader.java +++ b/libjava/java/io/InputStreamReader.java @@ -46,7 +46,7 @@ public class InputStreamReader extends Reader { this.in = in instanceof BufferedInputStream ? (BufferedInputStream) in - : new BufferedInputStream(in, 250); + : new BufferedInputStream(in); /* Don't need to call super(in) here as long as the lock gets set. */ this.lock = in; converter = decoder; -- cgit v1.2.3