Re: [cp-patches] FYI: signed JAR file support

[Mark Wielaard]

Hi,

On Sun, 2004-11-07 at 21:25, Casey Marshall wrote:
> I've checked in the patch I posted eariler, implementing signed JAR
> file support.

Thanks, very cool. Please write a NEWS entry for this.

When testing with gcj I found that the
JarFile.super.getInputStream(entry) construct made the compiler barf.
This is a bug in gcj. But since we want to be able to compile with gcj
(it is the default compiler) I am checking in this workaround:

2004-11-07  Mark Wielaard  <address@hidden>

        * java/util/jar/JarFile.java (EntryInputStream): Add actual
        InputStream as argument.
        (getInputStream): Construct a new EntryInputStream with the result of
        super.getInputStream(entry).

Cheers,

Mark


Index: java/util/jar/JarFile.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/jar/JarFile.java,v
retrieving revision 1.11
diff -u -r1.11 JarFile.java
--- java/util/jar/JarFile.java  7 Nov 2004 20:27:47 -0000       1.11
+++ java/util/jar/JarFile.java  7 Nov 2004 21:56:29 -0000
@@ -449,7 +449,7 @@
       {
         if (DEBUG)
           debug("reading and verifying " + entry);
-        return new EntryInputStream(entry);
+        return new EntryInputStream(entry, super.getInputStream(entry));
       }
     else
       {
@@ -875,9 +875,10 @@
     private final MessageDigest[] md;
     private boolean checked;
 
-    EntryInputStream(final ZipEntry entry) throws IOException
+    EntryInputStream(final ZipEntry entry, final InputStream in)
+      throws IOException
     {
-      super(JarFile.super.getInputStream(entry));
+      super(in);
       this.entry = entry;
 
       length = entry.getSize();

signature.asc
Description: This is a digitally signed message part