This is the mail archive of the java-patches@gcc.gnu.org mailing list for the Java project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Patch: FYI: ZipInputStream re-merge


I'm checking this in to 3.3 and 3.4.

This re-merges ZipInputStream with Classpath, bringing in a fixlet.

Tom

Index: ChangeLog
from  John Leuner  <jewel@debian.org>

	* java/util/zip/ZipInputStream.java: idem

Index: java/util/zip/ZipInputStream.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/util/zip/ZipInputStream.java,v
retrieving revision 1.17
diff -u -r1.17 ZipInputStream.java
--- java/util/zip/ZipInputStream.java 3 Dec 2002 22:06:31 -0000 1.17
+++ java/util/zip/ZipInputStream.java 12 Feb 2003 01:24:05 -0000
@@ -1,5 +1,5 @@
 /* java.util.zip.ZipInputStream
-   Copyright (C) 2001, 2002 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -286,6 +286,8 @@
    */
   public int read(byte[] b, int off, int len) throws IOException
   {
+    if (len == 0)
+      return 0;
     if (crc == null)
       throw new IOException("Stream closed.");
     if (entry == null)


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]