Author: j16sdiz
Date: 2009-04-03 08:59:33 +0000 (Fri, 03 Apr 2009)
New Revision: 26417
Modified:
trunk/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java
Log:
Fix NPE from r26397, factor out "if (altReq != null)"
Modified: trunk/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java
===================================================================
--- trunk/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java
2009-04-03 08:59:10 UTC (rev 26416)
+++ trunk/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java
2009-04-03 08:59:33 UTC (rev 26417)
@@ -508,8 +508,9 @@
Logger.minor(this,
"Ignoring cancelled recently succeeded item "+altReq);
altReq = null;
}
+ if (altReq != null) {
int prio =
altReq.getPriorityClass(container);
- if(altReq != null &&
+ if(
(prio <
choosenPriorityClass || (prio == choosenPriorityClass &&
fixRetryCount(altReq.getRetryCount()) <= chosenTracker.getNumber()))
&&
!altReq.isEmpty(container) && altReq != req) {
// Use the recent one instead
@@ -517,12 +518,13 @@
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");
// Don't need to reregister,
because removeRandom doesn't actually remove!
req = altReq;
- } else if(altReq != null) {
+ } else {
// Don't use the recent one
if(logMINOR)
Logger.minor(this,
"Chosen req "+req+" is better, reregistering recently succeeded "+altReq);
recent.add(altReq);
}
+ }
} else {
RandomGrabArray altRGA = null;
synchronized(recentSuccesses) {
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
