Author: toad
Date: 2008-08-13 12:07:53 +0000 (Wed, 13 Aug 2008)
New Revision: 21793
Modified:
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java
Log:
Turn off recentSuccesses for persistent requests. Doesn't make sense with us
choosing whole SendableRequest's.
Modified:
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java
===================================================================
---
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java
2008-08-13 12:06:59 UTC (rev 21792)
+++
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java
2008-08-13 12:07:53 UTC (rev 21793)
@@ -431,7 +431,14 @@
schedTransient.innerRegister(req,
random, container);
continue; // Try the next one on this retry
count.
}
+
// Check recentSuccesses
+ /** FIXME:
+ * This does not make sense with selecting a whole
SendableRequest
+ * at a time, so turn it off. However, what would make
sense would
+ * be to have recentSuccesses be a list of
ClientRequester's instead,
+ * like we do on trunk. */
+ if(!req.persistent()) {
List recent = req.persistent() ? recentSuccesses :
schedTransient.recentSuccesses;
SendableRequest altReq = null;
if(!recent.isEmpty()) {
@@ -462,6 +469,8 @@
Logger.minor(this, "Chosen req "+req+"
is better, reregistering recently succeeded "+altReq);
recent.add(altReq);
}
+ }
+
// Now we have chosen a request.
if(logMINOR) Logger.minor(this, "removeFirst()
returning "+req+" ("+chosenTracker.getNumber()+", prio "+
req.getPriorityClass(container)+",
retries "+req.getRetryCount()+", client "+req.getClient()+", client-req
"+req.getClientRequest()+ ')');
