[freenet-cvs] r14588 - trunk/freenet/src/freenet/client

[toad at freenetproject.org]

Author: toad
Date: 2007-08-11 12:18:20 +0000 (Sat, 11 Aug 2007)
New Revision: 14588

Modified:
   trunk/freenet/src/freenet/client/ArchiveManager.java
Log:
Always synchronize on this, not storedData

Modified: trunk/freenet/src/freenet/client/ArchiveManager.java
===================================================================
--- trunk/freenet/src/freenet/client/ArchiveManager.java	2007-08-10 22:28:42 UTC (rev 14587)
+++ trunk/freenet/src/freenet/client/ArchiveManager.java	2007-08-11 12:18:20 UTC (rev 14588)
@@ -140,7 +140,7 @@
 		if(logMINOR) Logger.minor(this, "Fetch cached: "+key+ ' ' +filename);
 		ArchiveKey k = new ArchiveKey(key, filename);
 		ArchiveStoreItem asi = null;
-		synchronized (storedData) {
+		synchronized (this) {
 			asi = (ArchiveStoreItem) storedData.get(k);	
 			if(asi == null) return null;
 			// Promote to top of LRU
@@ -154,10 +154,8 @@
 	 * Remove a file from the cache.
 	 * @param item The ArchiveStoreItem to remove.
 	 */
-	void removeCachedItem(ArchiveStoreItem item) {
-		synchronized (storedData) {
-			storedData.removeKey(item.key);	
-		}
+	synchronized void removeCachedItem(ArchiveStoreItem item) {
+		storedData.removeKey(item.key);	
 	}
 	
 	/**
@@ -390,7 +388,7 @@
 		ErrorArchiveStoreItem element = new ErrorArchiveStoreItem(ctx, key, name, error);
 		if(logMINOR) Logger.minor(this, "Adding error element: "+element+" for "+key+ ' ' +name);
 		ArchiveStoreItem oldItem;
-		synchronized (storedData) {
+		synchronized (this) {
 			oldItem = (ArchiveStoreItem) storedData.get(element.key);
 			storedData.push(element.key, element);	
 		}
@@ -418,7 +416,7 @@
 		if((!gotElement.value) && name.equals(callbackName)) {
 			matchBucket = element.getReaderBucket();
 		}
-		synchronized (storedData) {
+		synchronized (this) {
 			oldItem = (ArchiveStoreItem) storedData.get(element.key);
 			storedData.push(element.key, element);
 		}