aboutsummaryrefslogtreecommitdiff
path: root/libjava
diff options
context:
space:
mode:
Diffstat (limited to 'libjava')
-rw-r--r--libjava/ChangeLog5
-rw-r--r--libjava/java/util/zip/InflaterInputStream.java4
2 files changed, 8 insertions, 1 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index d6f977f..cf20ae0 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 5aac73d..b045349 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;