Author: toad
Date: 2009-04-06 22:28:12 +0000 (Mon, 06 Apr 2009)
New Revision: 26576
Modified:
trunk/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java
Log:
Check altReq != req a bit earlier
Modified: trunk/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java
===================================================================
--- trunk/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java
2009-04-06 22:27:27 UTC (rev 26575)
+++ trunk/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java
2009-04-06 22:28:12 UTC (rev 26576)
@@ -508,10 +508,9 @@
Logger.minor(this,
"Ignoring cancelled recently succeeded item "+altReq);
altReq = null;
}
- if (altReq != null) {
+ if (altReq != null && altReq != req) {
int prio =
altReq.getPriorityClass(container);
- if((prio < choosenPriorityClass
|| (prio == choosenPriorityClass && fixRetryCount(altReq.getRetryCount()) <=
chosenTracker.getNumber()))
- && altReq !=
req) {
+ if(prio < choosenPriorityClass
|| (prio == choosenPriorityClass && fixRetryCount(altReq.getRetryCount()) <=
chosenTracker.getNumber())) {
// Use the recent one
instead
if(logMINOR)
Logger.minor(this, "Recently succeeded (transient) req "+altReq+"
(prio="+altReq.getPriorityClass(container)+" retry count
"+altReq.getRetryCount()+") is better than "+req+"
(prio="+req.getPriorityClass(container)+" retry "+req.getRetryCount()+"), using
that");
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
