Author: toad
Date: 2007-02-21 19:23:58 +0000 (Wed, 21 Feb 2007)
New Revision: 11883
Modified:
trunk/freenet/src/freenet/client/ArchiveManager.java
Log:
Locking, fix deadlock
Modified: trunk/freenet/src/freenet/client/ArchiveManager.java
===================================================================
--- trunk/freenet/src/freenet/client/ArchiveManager.java 2007-02-21
16:53:07 UTC (rev 11882)
+++ trunk/freenet/src/freenet/client/ArchiveManager.java 2007-02-21
19:23:58 UTC (rev 11883)
@@ -369,9 +369,7 @@
private void addErrorElement(ArchiveStoreContext ctx, FreenetURI key,
String name, String error) {
ErrorArchiveStoreItem element = new ErrorArchiveStoreItem(ctx,
key, name, error);
if(logMINOR) Logger.minor(this, "Adding error element:
"+element+" for "+key+ ' ' +name);
- synchronized(storedData) {
- storedData.push(element.key, element);
- }
+ storedData.push(element.key, element);
}
/**
@@ -380,10 +378,8 @@
private void addStoreElement(ArchiveStoreContext ctx, FreenetURI key,
String name, TempStoreElement temp) {
RealArchiveStoreItem element = new RealArchiveStoreItem(this,
ctx, key, name, temp);
if(logMINOR) Logger.minor(this, "Adding store element:
"+element+" ( "+key+ ' ' +name+" size "+element.spaceUsed()+" )");
- synchronized(storedData) {
- storedData.push(element.key, element);
- trimStoredData();
- }
+ storedData.push(element.key, element);
+ trimStoredData();
}
/**
