Author: toad
Date: 2009-04-04 13:25:55 +0000 (Sat, 04 Apr 2009)
New Revision: 26511
Modified:
trunk/freenet/src/freenet/node/fcp/PersistentGet.java
trunk/freenet/src/freenet/node/fcp/PersistentPut.java
trunk/freenet/src/freenet/node/fcp/PersistentPutDir.java
Log:
Activation before removal
Modified: trunk/freenet/src/freenet/node/fcp/PersistentGet.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/PersistentGet.java 2009-04-04
12:35:14 UTC (rev 26510)
+++ trunk/freenet/src/freenet/node/fcp/PersistentGet.java 2009-04-04
13:25:55 UTC (rev 26511)
@@ -91,8 +91,11 @@
}
public void removeFrom(ObjectContainer container) {
+ container.activate(uri, 5);
uri.removeFrom(container);
+ container.activate(targetFile, 5);
container.delete(targetFile);
+ container.activate(tempFile, 5);
container.delete(tempFile);
container.delete(this);
}
Modified: trunk/freenet/src/freenet/node/fcp/PersistentPut.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/PersistentPut.java 2009-04-04
12:35:14 UTC (rev 26510)
+++ trunk/freenet/src/freenet/node/fcp/PersistentPut.java 2009-04-04
13:25:55 UTC (rev 26511)
@@ -96,8 +96,11 @@
}
public void removeFrom(ObjectContainer container) {
+ container.activate(uri, 5);
uri.removeFrom(container);
+ container.activate(origFilename, 5);
container.delete(origFilename);
+ container.activate(targetURI, 5);
targetURI.removeFrom(container);
container.delete(this);
}
Modified: trunk/freenet/src/freenet/node/fcp/PersistentPutDir.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/PersistentPutDir.java 2009-04-04
12:35:14 UTC (rev 26510)
+++ trunk/freenet/src/freenet/node/fcp/PersistentPutDir.java 2009-04-04
13:25:55 UTC (rev 26511)
@@ -133,8 +133,11 @@
}
public void removeFrom(ObjectContainer container) {
+ container.activate(uri, 5);
uri.removeFrom(container);
+ container.activate(manifestElements, Integer.MAX_VALUE);
removeFrom(manifestElements, container);
+ container.activate(cached, Integer.MAX_VALUE);
cached.removeFrom(container);
container.delete(this);
}
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
