[freenet-cvs] r20586 - branches/db4o/freenet/src/freenet/node

[t...@freenetproject.org]

Author: toad
Date: 2008-06-21 16:19:34 +0000 (Sat, 21 Jun 2008)
New Revision: 20586

Modified:
   branches/db4o/freenet/src/freenet/node/RequestStarter.java
Log:
Don't fill the queue unless we used a request from the queue.
(On startup fill the queue anyway).

Modified: branches/db4o/freenet/src/freenet/node/RequestStarter.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/RequestStarter.java  2008-06-21 
16:14:37 UTC (rev 20585)
+++ branches/db4o/freenet/src/freenet/node/RequestStarter.java  2008-06-21 
16:19:34 UTC (rev 20586)
@@ -193,6 +193,7 @@
         * @return
         */
        private ChosenRequest getRequest() {
+               boolean usedReq = true;
                ChosenRequest req = null;
                while(true) {
                        synchronized(queue) {
@@ -209,10 +210,15 @@
                                        queue.addFirst(req);
                                }
                                req = null;
+                               usedReq = false;
                        }
                }
-               if(req == null) req = betterReq;
-               sched.queueFillRequestStarterQueue();
+               if(req == null) {
+                       usedReq = false;
+                       req = betterReq;
+               }
+               if(usedReq)
+                       sched.queueFillRequestStarterQueue();
                return req;
        }