don't rely on softref queue, explicitly remove dead entry when found, fixes #444

richhickey · richhickey · commit 167a73857a74 · 2010-09-28T16:28:52.000-04:00
diff --git a/src/jvm/clojure/lang/DynamicClassLoader.java b/src/jvm/clojure/lang/DynamicClassLoader.java
@@ -54,6 +54,8 @@ protected Class<?> findClass(String name) throws ClassNotFoundException{
 		Class c = cr.get();
         if(c != null)
             return c;
+		else
+	        classCache.remove(name, cr);
 		}
 	return super.findClass(name);
 }
diff --git a/src/jvm/clojure/lang/Keyword.java b/src/jvm/clojure/lang/Keyword.java
@@ -36,6 +36,7 @@ public static Keyword intern(Symbol sym){
 	if(existingk != null)
 		return existingk;
 	//entry died in the interim, do over
+	table.remove(sym, existingRef);
 	return intern(sym);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,8 @@ protected Class<?> findClass(String name) throws ClassNotFoundException{`
`54`	`54`	`Class c = cr.get();`
`55`	`55`	`if(c != null)`
`56`	`56`	`return c;`
	`57`	`+ else`
	`58`	`+ classCache.remove(name, cr);`
`57`	`59`	`}`
`58`	`60`	`return super.findClass(name);`
`59`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,7 @@ public static Keyword intern(Symbol sym){`
`36`	`36`	`if(existingk != null)`
`37`	`37`	`return existingk;`
`38`	`38`	`//entry died in the interim, do over`
	`39`	`+ table.remove(sym, existingRef);`
`39`	`40`	`return intern(sym);`
`40`	`41`	`}`
`41`	`42`