Author: toad
Date: 2009-04-04 13:28:42 +0000 (Sat, 04 Apr 2009)
New Revision: 26512
Modified:
trunk/freenet/src/freenet/node/fcp/PersistentPutDir.java
Log:
Don't remove manifestElements in PersistentPutDir.removeFrom, they are not
copied, they are ClientPutDir's responsibility
Modified: trunk/freenet/src/freenet/node/fcp/PersistentPutDir.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/PersistentPutDir.java 2009-04-04
13:25:55 UTC (rev 26511)
+++ trunk/freenet/src/freenet/node/fcp/PersistentPutDir.java 2009-04-04
13:28:42 UTC (rev 26512)
@@ -135,23 +135,10 @@
public void removeFrom(ObjectContainer container) {
container.activate(uri, 5);
uri.removeFrom(container);
- container.activate(manifestElements, Integer.MAX_VALUE);
- removeFrom(manifestElements, container);
+ // manifestElements will be removed by ClientPutDir.freeData,
not our problem.
container.activate(cached, Integer.MAX_VALUE);
cached.removeFrom(container);
container.delete(this);
}
- private void removeFrom(HashMap manifestElements, ObjectContainer
container) {
- for(Iterator
i=manifestElements.values().iterator();i.hasNext();) {
- Object o = i.next();
- if(o instanceof HashMap)
- removeFrom((HashMap)o, container);
- else
- ((ManifestElement) o).removeFrom(container);
- }
- manifestElements.clear();
- container.delete(manifestElements);
- }
-
}
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
