Author: toad
Date: 2009-04-03 13:55:12 +0000 (Fri, 03 Apr 2009)
New Revision: 26432
Modified:
trunk/freenet/src/freenet/client/async/MultiPutCompletionCallback.java
Log:
Simplify. We definitely can store stuff and then delete it, we have
demonstrated this in many places.
Modified: trunk/freenet/src/freenet/client/async/MultiPutCompletionCallback.java
===================================================================
--- trunk/freenet/src/freenet/client/async/MultiPutCompletionCallback.java
2009-04-03 13:50:15 UTC (rev 26431)
+++ trunk/freenet/src/freenet/client/async/MultiPutCompletionCallback.java
2009-04-03 13:55:12 UTC (rev 26432)
@@ -58,16 +58,8 @@
return;
}
waitingFor.remove(state);
- if(waitingForBlockSet.contains(state)) {
- waitingForBlockSet.remove(state);
- if(persistent && !waitingFor.isEmpty())
-
container.ext().store(waitingForBlockSet, 1);
- }
- if(waitingForFetchable.contains(state)) {
- waitingForFetchable.remove(state);
- if(persistent && !waitingFor.isEmpty())
-
container.ext().store(waitingForFetchable, 1);
- }
+ waitingForBlockSet.remove(state);
+ waitingForFetchable.remove(state);
if(!(waitingFor.isEmpty() && started)) {
if(persistent) {
container.ext().store(waitingFor, 1);
@@ -79,7 +71,12 @@
if(persistent) container.store(this);
}
}
- if(persistent) state.removeFrom(container, context);
+ if(persistent) {
+ container.ext().store(waitingFor, 2);
+ container.ext().store(waitingForBlockSet, 2);
+ container.ext().store(waitingForFetchable, 2);
+ state.removeFrom(container, context);
+ }
if(complete) {
Logger.minor(this, "Completing...");
complete(null, container, context);
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
