OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

InflaterInputStream (read): Don't return -1 unless the infate() call didn't deliver any output.

Browse Source 
* 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.

From-SVN: r37846
This commit is contained in:
Bryce McKinlay 2000-11-29 10:06:03 +00:00 committed by Bryce McKinlay
parent 172c38bb69
commit d02bc1fb25
4 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libjava/ChangeLog
View File

@ -5,6 +5,13 @@
* configure.in: Check for setlocale.
* configure: Rebuilt.
* include/config.h.in: Rebuilt.
* 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.
2000-11-28 Warren Levy <warrenl@cygnus.com>

7
libjava/java/io/ByteArrayInputStream.java
View File

@ -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;

2
libjava/java/io/InputStreamReader.java
View File

@ -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;

17
libjava/java/util/zip/InflaterInputStream.java
View File

@ -44,8 +44,6 @@ public class InflaterInputStream extends FilterInputStream
{
protected void fill () throws IOException
{
if (inf == null)
throw new IOException ("stream closed");
len = in.read(buf, 0, buf.length);
if (len != -1)
inf.setInput(buf, 0, len);
@ -85,18 +83,23 @@ public class InflaterInputStream extends FilterInputStream
return -1;
if (inf.needsInput())
fill ();
if (this.len == -1)
return -1; // Couldn't get any more data to feed to the Inflater
if (inf.needsDictionary())
return -1;
int count;
try
{
return inf.inflate(buf, off, len);
count = inf.inflate(buf, off, len);
if (count == 0)
{
if (len == -1)
return -1; // Couldn't get any more data to feed to the Inflater
if (inf.needsDictionary())
throw new ZipException ("Inflater needs Dictionary");
}
}
catch (DataFormatException dfe)
{
throw new ZipException (dfe.getMessage());
}
return count;
}
public void close () throws IOException