diff options
| author | mark <mark@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-02-13 23:15:20 +0000 |
|---|---|---|
| committer | mark <mark@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-02-13 23:15:20 +0000 |
| commit | 846f36b8dcab199a4c2da5de68d5bc383afdb5fe (patch) | |
| tree | f988f66c3a7883b9c28abe6102fee256bb055671 | |
| parent | 71cab827590cd7bc4af1cf658e0ae614f314da89 (diff) | |
| download | ppe42-gcc-846f36b8dcab199a4c2da5de68d5bc383afdb5fe.tar.gz ppe42-gcc-846f36b8dcab199a4c2da5de68d5bc383afdb5fe.zip | |
* java/util/zip/InflaterInputStream.java (read): Return zero when len
is zero.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@62872 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/java/util/zip/InflaterInputStream.java | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index d6f977f8dd9..cf20ae01d23 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,4 +1,9 @@ 2003-02-13 Mark Wielaard <mark@klomp.org> + + * java/util/zip/InflaterInputStream.java (read): Return zero when len + is zero. + +2003-02-13 Mark Wielaard <mark@klomp.org> * java/io/BufferedOutputStream.java (write(int)): Only flush when next byte cannot be buffered. diff --git a/libjava/java/util/zip/InflaterInputStream.java b/libjava/java/util/zip/InflaterInputStream.java index 5aac73d7e5a..b04534977f1 100644 --- a/libjava/java/util/zip/InflaterInputStream.java +++ b/libjava/java/util/zip/InflaterInputStream.java @@ -1,5 +1,5 @@ /* InflaterInputStream.java - Input stream filter for decompressing - Copyright (C) 1999, 2000, 2002 Free Software Foundation, Inc. + Copyright (C) 1999, 2000, 2002, 2003 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -90,6 +90,8 @@ public class InflaterInputStream extends FilterInputStream { if (inf == null) throw new IOException ("stream closed"); + if (len == 0) + return 0; if (inf.finished()) return -1; |
