Update of /cvsroot/freenet/freenet/src/freenet/node
In directory sc8-pr-cvs1:/tmp/cvs-serv28920/src/freenet/node
Modified Files:
NewNodeContactor.java
Log Message:
6353:
When we send out maintenance requests, when we get FCP or internal requests with skip
datastore enabled:
Don't actually delete the key from the datastore... just ignore the fact that it's
already there. The commit will fail, unless the original one didn't work.
Index: NewNodeContactor.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/NewNodeContactor.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- NewNodeContactor.java 22 Nov 2003 17:56:00 -0000 1.2
+++ NewNodeContactor.java 22 Nov 2003 20:48:48 -0000 1.3
@@ -51,9 +51,9 @@
// Remove key from store if it exists
// FIXME: like in InternalClient, and FCP, maybe we want to
// keep it in the store and just pretend it's not for purposes of this
request?
- if (n.ds.contains(k)) {
- n.ds.remove(k, false);
- }
+// if (n.ds.contains(k)) {
+// n.ds.remove(k, false);
+// }
// Calculate HTL
int htl = Node.maxHopsToLive;
double occurrences = Core.diagnostics.getValue("startedRequestHTL",
@@ -67,7 +67,7 @@
}
RequestInitiator ri =
new RequestInitiator(id, System.currentTimeMillis());
- Pending p = new DataPending(id, htl, k, null, ct, ri, true);
+ Pending p = new DataPending(id, htl, k, null, ct, ri, true, true);
// Schedule a NodeContactorVector which returns the Pending
// And then schedules the RequestInitiator
NewNodeContactorRequest newReq =
_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs
