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

[nextg...@freenetproject.org]

Author: nextgens
Date: 2007-03-01 01:13:48 +0000 (Thu, 01 Mar 2007)
New Revision: 11938

Modified:
   trunk/freenet/src/freenet/client/async/ClientRequestScheduler.java
Log:
clarify a log message, refactor a bit

Modified: trunk/freenet/src/freenet/client/async/ClientRequestScheduler.java
===================================================================
--- trunk/freenet/src/freenet/client/async/ClientRequestScheduler.java  
2007-03-01 01:11:39 UTC (rev 11937)
+++ trunk/freenet/src/freenet/client/async/ClientRequestScheduler.java  
2007-03-01 01:13:48 UTC (rev 11938)
@@ -259,10 +259,10 @@
                return Math.max(0, retryCount-MIN_RETRY_COUNT);
        }

-       private int removeFirstAccordingToPriorities(int priority){
+       private int removeFirstAccordingToPriorities(){
                SortedVectorByNumber result = null;

-               short fuzz = -1, iteration = 0;
+               short fuzz = -1, iteration = 0, priority;
                synchronized (this) {
                        if(PRIORITY_SOFT.equals(choosenPriorityScheduler))
                                fuzz = -1;
@@ -292,11 +292,10 @@
        public SendableRequest removeFirst() {
                // Priorities start at 0
                if(logMINOR) Logger.minor(this, "removeFirst()");
-               int choosenPriorityClass = Integer.MAX_VALUE;
-               choosenPriorityClass = 
removeFirstAccordingToPriorities(choosenPriorityClass);
+               int choosenPriorityClass = removeFirstAccordingToPriorities();
                if(choosenPriorityClass == -1) {
                        if(logMINOR)
-                               Logger.minor(this, "No priority with requests");
+                               Logger.minor(this, "Nothing to do");
                        return null;
                }
                SortedVectorByNumber s = priorities[choosenPriorityClass];