Author: toad
Date: 2007-05-23 15:51:53 +0000 (Wed, 23 May 2007)
New Revision: 13333
Modified:
trunk/freenet/src/freenet/client/ArchiveManager.java
Log:
Remove unnecessary locking and fix deadlock
Modified: trunk/freenet/src/freenet/client/ArchiveManager.java
===================================================================
--- trunk/freenet/src/freenet/client/ArchiveManager.java 2007-05-23
15:45:48 UTC (rev 13332)
+++ trunk/freenet/src/freenet/client/ArchiveManager.java 2007-05-23
15:51:53 UTC (rev 13333)
@@ -139,7 +139,6 @@
ArchiveStoreItem asi = null;
synchronized (storedData) {
asi = (ArchiveStoreItem) storedData.get(k);
-
if(asi == null) return null;
// Promote to top of LRU
storedData.push(k, asi);
@@ -388,8 +387,8 @@
if(logMINOR) Logger.minor(this, "Adding store element:
"+element+" ( "+key+ ' ' +name+" size "+element.spaceUsed()+" )");
synchronized (storedData) {
storedData.push(element.key, element);
- trimStoredData();
}
+ trimStoredData();
}
/**
