[freenet-cvs] r13108 - trunk/freenet/src/freenet/client/async

[toad at freenetproject.org]

Author: toad
Date: 2007-05-02 18:40:41 +0000 (Wed, 02 May 2007)
New Revision: 13108

Modified:
   trunk/freenet/src/freenet/client/async/ClientRequestScheduler.java
Log:
missing fixRetryCount

Modified: trunk/freenet/src/freenet/client/async/ClientRequestScheduler.java
===================================================================
--- trunk/freenet/src/freenet/client/async/ClientRequestScheduler.java	2007-05-02 18:14:51 UTC (rev 13107)
+++ trunk/freenet/src/freenet/client/async/ClientRequestScheduler.java	2007-05-02 18:40:41 UTC (rev 13108)
@@ -353,8 +353,10 @@
 				if(altRGA != null) {
 					SendableRequest altReq = (SendableRequest) (altRGA.removeRandom());
 					if(altReq != null && altReq.getPriorityClass() <= choosenPriorityClass && 
-							altReq.getRetryCount() <= rga.getNumber()) {
+							fixRetryCount(altReq.getRetryCount()) <= rga.getNumber()) {
 						// Use the recent one instead
+						if(logMINOR)
+							Logger.minor(this, "Recently succeeded req "+altReq+" is better, using that, reregistering chosen "+req);
 						innerRegister(req);
 						req = altReq;
 					} else {
@@ -362,6 +364,8 @@
 							synchronized(this) {
 								recentSuccesses.addLast(new WeakReference(altRGA));
 							}
+							if(logMINOR)
+								Logger.minor(this, "Chosen req "+req+" is better, reregistering recently succeeded "+altReq);
 							innerRegister(altReq);
 						}
 					}