diff options
| author | mark <mark@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-08-24 22:48:12 +0000 |
|---|---|---|
| committer | mark <mark@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-08-24 22:48:12 +0000 |
| commit | 4dd5916c1f2b2db4bbe8e3c2245c2cac127c4682 (patch) | |
| tree | 1e5cc02ba52800a5f61f143eeedeed4ddbdd6630 /libjava | |
| parent | ee1d4c3d90b54bf82f6b44e02aa4cedc19bdba52 (diff) | |
| download | ppe42-gcc-4dd5916c1f2b2db4bbe8e3c2245c2cac127c4682.tar.gz ppe42-gcc-4dd5916c1f2b2db4bbe8e3c2245c2cac127c4682.zip | |
* java/util/zip/InflaterInputStream.java (read(byte[],int,int)):
return -1 when fill() has no more data for the Inflater.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@35963 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/java/util/zip/InflaterInputStream.java | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 4fe67e2a9c1..2a525d1dcc1 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,5 +1,10 @@ 2000-08-23 Mark Wielaard <mark@klomp.org> + * java/util/zip/InflaterInputStream.java (read(byte[],int,int)): + return -1 when fill() has no more data for the Inflater. + +2000-08-23 Mark Wielaard <mark@klomp.org> + * java/io/PrintWriter.java (print(String)): Don't catch IOException, write(String) already does. diff --git a/libjava/java/util/zip/InflaterInputStream.java b/libjava/java/util/zip/InflaterInputStream.java index 92b897a32e4..e09f208349a 100644 --- a/libjava/java/util/zip/InflaterInputStream.java +++ b/libjava/java/util/zip/InflaterInputStream.java @@ -65,6 +65,8 @@ 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; try |
