[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: fix for JAR url connections

[Kaffe CVS]

PatchSet 5527 
Date: 2005/02/13 22:21:07
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Resynced with GNU Classpath: fix for JAR url connections

2005-02-13  Dalibor Topic  <robilad at kaffe.org>

        Resynced with GNU Classpath.

        2005-02-09  Mark Wielaard  <mark at klomp.org>

        * gnu/java/net/protocol/jar/Connection.java (getJarFile):
        Rename jar_file to jf.

        2005-02-09  Tom Tromey  <tromey at redhat.com>

        * gnu/java/net/protocol/jar/Connection.java (getJarFile): Open
        jar file with OPEN_DELETE.

Members: 
	ChangeLog:1.3571->1.3572 
	libraries/javalib/gnu/java/net/protocol/jar/Connection.java:1.6->1.7 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3571 kaffe/ChangeLog:1.3572
--- kaffe/ChangeLog:1.3571	Sun Feb 13 22:13:13 2005
+++ kaffe/ChangeLog	Sun Feb 13 22:21:07 2005
@@ -2,6 +2,20 @@
 
 	Resynced with GNU Classpath.
 
+	2005-02-09  Mark Wielaard  <mark at klomp.org>
+
+        * gnu/java/net/protocol/jar/Connection.java (getJarFile):
+        Rename jar_file to jf.
+
+	2005-02-09  Tom Tromey  <tromey at redhat.com>
+
+        * gnu/java/net/protocol/jar/Connection.java (getJarFile): Open
+        jar file with OPEN_DELETE.
+
+2005-02-13  Dalibor Topic  <robilad at kaffe.org>
+
+	Resynced with GNU Classpath.
+
 	2005-02-09  Michael Koch  <konqueror at gmx.de>
 
         * java/awt/Scrollbar.java: Reformatted.
Index: kaffe/libraries/javalib/gnu/java/net/protocol/jar/Connection.java
diff -u kaffe/libraries/javalib/gnu/java/net/protocol/jar/Connection.java:1.6 kaffe/libraries/javalib/gnu/java/net/protocol/jar/Connection.java:1.7
--- kaffe/libraries/javalib/gnu/java/net/protocol/jar/Connection.java:1.6	Thu Feb  3 17:14:39 2005
+++ kaffe/libraries/javalib/gnu/java/net/protocol/jar/Connection.java	Sun Feb 13 22:21:17 2005
@@ -97,9 +97,8 @@
 	  
 	  fos.close();
 	  // Always verify the Manifest, open read only and delete when done.
-	  // XXX ZipFile.OPEN_DELETE not yet implemented.
-	  // jf = new JarFile (f, true, ZipFile.OPEN_READ | ZipFile.OPEN_DELETE);
-	  jf = new JarFile (f, true, ZipFile.OPEN_READ);
+	  jf = new JarFile (f, true,
+			    ZipFile.OPEN_READ | ZipFile.OPEN_DELETE);
 	}
           
       cache.put (url, jf);