[kaffe] Jar files in 1.1.3?

[Casey Marshall]

--=-=-=

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

>>>>> "Ito" == Ito Kazumitsu <ito.kazumitsu@hitachi-cable.co.jp> writes:

Ito> In message "Re: [kaffe] Jar files in 1.1.3?"  on 03/12/10, Casey
Ito> Marshall <rsdio@metastatic.org> writes:

>> The problem is with kaffe.tools.jar.Jar. Line 1053.

Ito> I have not studied kaffe/tools/jar/Jar.java yet.  But I could
Ito> reproduce the error.  It seems that this error occurs when the
Ito> files to be archived are not directories but ordinary files.

To me, it looks as though Jar.java was written for a different version
of the java.util.jar classes (Classpath's versions were recently
merged, right?) and they explictly put the "Name" attribute.

Classpath's Manifest class writes "Name" attributes automatically, so
I think Kaffe's Jar is wrong.

The fix is trivial, and attached.

- -- 
Casey Marshall || rsdio@metastatic.org
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.1 (GNU/Linux)
Comment: Processed by Mailcrypt 3.5.7 <http://mailcrypt.sourceforge.net/>

iD8DBQE/2IoOgAuWMgRGsWsRAhl1AJ0c4LZ8QUy5hvwGMmYLpFk5ChIB7wCdEYNg
KaQ5KtLG0Md6QUO1Pqg2E7k=
=BEGV
-----END PGP SIGNATURE-----

--=-=-=
Content-Type: text/x-patch
Content-Disposition: attachment; filename=jar.diff

Index: libraries/javalib/kaffe/tools/jar/Jar.java
===================================================================
RCS file: /cvs/kaffe/kaffe/libraries/javalib/kaffe/tools/jar/Jar.java,v
retrieving revision 1.2
diff -u -r1.2 Jar.java
--- libraries/javalib/kaffe/tools/jar/Jar.java	5 Feb 2003 20:48:34 -0000	1.2
+++ libraries/javalib/kaffe/tools/jar/Jar.java	11 Dec 2003 15:12:22 -0000
@@ -1050,7 +1050,6 @@
 		    attr = new Attributes();
 		    jar_manifest.getEntries().put(name, attr);
 		}
-		attr.putValue("Name", name);
 
 		// Compute hash values
 		StringBuffer alglist = new StringBuffer();

--=-=-=--