[kaffe] CVS kaffe (robilad): Reverted ZipFile synchronisation patch, and applied Guilhem's fix

[Kaffe CVS]

PatchSet 5816 
Date: 2005/01/08 00:31:44
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Reverted ZipFile synchronisation patch, and applied Guilhem's fix

2005-01-08  Guilhem Lavaux  <guilhem at kaffe.org>

* kaffe/kaffevm/jar.c (cacheJarFile): When removing
an already cached file, set user count to 0 first.

2005-01-08  Dalibor Topic  <robilad at kaffe.org>

* libraries/javalib/java/util/zip/ZipFile.java
(ZipFile): Reverted synchronisation patches.

Members: 
	ChangeLog:1.3360->1.3361 
	kaffe/kaffevm/jar.c:1.35->1.36 
	libraries/javalib/java/util/zip/ZipFile.java:1.17->1.18 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3360 kaffe/ChangeLog:1.3361
--- kaffe/ChangeLog:1.3360	Fri Jan  7 19:04:30 2005
+++ kaffe/ChangeLog	Sat Jan  8 00:31:44 2005
@@ -1,3 +1,13 @@
+2005-01-08  Guilhem Lavaux  <guilhem at kaffe.org>
+
+	* kaffe/kaffevm/jar.c (cacheJarFile): When removing
+	an already cached file, set user count to 0 first.
+	
+2005-01-08  Dalibor Topic  <robilad at kaffe.org>
+
+	* libraries/javalib/java/util/zip/ZipFile.java
+	(ZipFile): Reverted synchronisation patches.
+
 2005-01-07  Dalibor Topic  <robilad at kaffe.org>
 
 	Resynced with GNU Classpath.
Index: kaffe/kaffe/kaffevm/jar.c
diff -u kaffe/kaffe/kaffevm/jar.c:1.35 kaffe/kaffe/kaffevm/jar.c:1.36
--- kaffe/kaffe/kaffevm/jar.c:1.35	Wed Jan  5 22:40:58 2005
+++ kaffe/kaffe/kaffevm/jar.c	Sat Jan  8 00:31:46 2005
@@ -313,7 +313,11 @@
 	if( dead_jar )
 		collectJarFile(dead_jar);
 	else if( already_cached )
+	{
+		assert(jf->users == 1);
+		jf->users = 0;
 		collectJarFile(jf);
+	}
 
 	assert(retval != 0);
 	
Index: kaffe/libraries/javalib/java/util/zip/ZipFile.java
diff -u kaffe/libraries/javalib/java/util/zip/ZipFile.java:1.17 kaffe/libraries/javalib/java/util/zip/ZipFile.java:1.18
--- kaffe/libraries/javalib/java/util/zip/ZipFile.java:1.17	Thu Jan  6 13:00:51 2005
+++ kaffe/libraries/javalib/java/util/zip/ZipFile.java	Sat Jan  8 00:33:29 2005
@@ -45,9 +45,7 @@
 {
 	name = fname;
 	/* only have one thread at a time attempt to open the zip file */
-	synchronized(ZipFile.class) {
-	    zip = openZipFile0(fname);
-	}
+	zip = openZipFile0(fname);
 	if (zip == null) {
 		throw new IOException("No such zip file " + fname);
 	}