diff options
| author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-10-21 19:32:51 +0000 |
|---|---|---|
| committer | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-10-21 19:32:51 +0000 |
| commit | 0f0b79cb37ab6ff75ee063561817e66813e68463 (patch) | |
| tree | 2eb555294af2bb33a9c09ac8186dfde254e6469a /libjava/java/util | |
| parent | 17c381ce5b34e251656ffec36b0c909f660050b0 (diff) | |
| download | gcc-0f0b79cb37ab6ff75ee063561817e66813e68463.tar.gz | |
* java/util/zip/InflaterInputStream.java (fill): Don't throw an
exception if we hit EOF of `in'.
(read): Handle case where inflating returns -1.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@89395 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/java/util')
| -rw-r--r-- | libjava/java/util/zip/InflaterInputStream.java | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/libjava/java/util/zip/InflaterInputStream.java b/libjava/java/util/zip/InflaterInputStream.java index 3676a2cdb5d..bfe93bd152c 100644 --- a/libjava/java/util/zip/InflaterInputStream.java +++ b/libjava/java/util/zip/InflaterInputStream.java @@ -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; } /** |