[freenet-cvs] r20821 - branches/db4o/freenet/src/freenet/client/async

[t...@freenetproject.org]

Author: toad
Date: 2008-06-27 16:48:16 +0000 (Fri, 27 Jun 2008)
New Revision: 20821

Modified:
   
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java
Log:
Try next priority if nothing on this priority

Modified: 
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java
===================================================================
--- 
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java  
    2008-06-27 16:30:25 UTC (rev 20820)
+++ 
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java  
    2008-06-27 16:48:16 UTC (rev 20821)
@@ -304,7 +304,7 @@
                SortedVectorByNumber trans = 
schedTransient.priorities[choosenPriorityClass];
                if(perm == null && trans == null) {
                        if(logMINOR) Logger.minor(this, "No requests to run: 
chosen priority empty");
-                       return null;
+                       continue; // Try next priority
                }
                int permRetryIndex = 0;
                int transRetryIndex = 0;
@@ -321,7 +321,7 @@
                        }
                        if(permRetryCount == Integer.MAX_VALUE && 
transRetryCount == Integer.MAX_VALUE) {
                                if(logMINOR) Logger.minor(this, "No requests to 
run: ran out of retrycounts on chosen priority");
-                               return null;
+                               break; // Try next priority
                        }
                        SectoredRandomGrabArrayWithInt chosenTracker = null;
                        SortedVectorByNumber trackerParent = null;