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

InflaterInputStream.java (fill): Don't throw an exception if we hit EOF of `in'.

Browse Source 
* java/util/zip/InflaterInputStream.java (fill): Don't throw an
	exception if we hit EOF of `in'.
	(read): Handle case where inflating returns -1.

From-SVN: r89395
This commit is contained in:
Tom Tromey 2004-10-21 19:32:51 +00:00 committed by Tom Tromey
parent b228bf7fd2
commit c28fdf712f
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libjava/ChangeLog
View File

@ -1,3 +1,9 @@
2004-10-21 Tom Tromey <tromey@redhat.com>
* java/util/zip/InflaterInputStream.java (fill): Don't throw an
exception if we hit EOF of `in'.
(read): Handle case where inflating returns -1.
2004-10-21 Ulrich Weigand <uweigand@de.ibm.com>
* gnu/java/nio/channels/natFileChannelPosix.cc

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

@ -152,10 +152,8 @@ public class InflaterInputStream extends FilterInputStream
len = in.read(buf, 0, buf.length);
if (len < 0)
throw new ZipException("Deflated stream ends early.");
inf.setInput(buf, 0, len);
if (len >= 0)
inf.setInput(buf, 0, len);
}
/**
@ -188,7 +186,7 @@ public class InflaterInputStream extends FilterInputStream
return -1;
int count = 0;
for (;;)
while (count == 0)
{
if (inf.needsInput())
fill();
@ -211,10 +209,8 @@ public class InflaterInputStream extends FilterInputStream
{
throw new ZipException(dfe.getMessage());
}
if (count > 0)
return count;
}
return count;
}
/**