[Swift-commit] r5124 - trunk/src/org/griphyn/vdl/karajan/lib/cache

[hategan at ci.uchicago.edu]

Author: hategan
Date: 2011-09-17 23:35:34 -0500 (Sat, 17 Sep 2011)
New Revision: 5124

Modified:
   trunk/src/org/griphyn/vdl/karajan/lib/cache/LRUFileCache.java
Log:
merged cache deadlock fix from stable branch

Modified: trunk/src/org/griphyn/vdl/karajan/lib/cache/LRUFileCache.java
===================================================================
--- trunk/src/org/griphyn/vdl/karajan/lib/cache/LRUFileCache.java	2011-09-18 04:32:18 UTC (rev 5123)
+++ trunk/src/org/griphyn/vdl/karajan/lib/cache/LRUFileCache.java	2011-09-18 04:35:34 UTC (rev 5124)
@@ -20,7 +20,7 @@
 		return s.addFile(entry);
 	}
 
-	public synchronized CacheReturn addAndLockEntry(File entry) {
+	public CacheReturn addAndLockEntry(File entry) {
 		Site s = getSite(entry.getHost());
 		return s.addAndLockFile(entry);
 	}


Property changes on: trunk/src/org/griphyn/vdl/karajan/lib/cache/LRUFileCache.java
___________________________________________________________________
Added: svn:mergeinfo
   + /branches/release-0.93/src/org/griphyn/vdl/karajan/lib/cache/LRUFileCache.java:5123