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

[t...@freenetproject.org]

Author: toad
Date: 2008-06-24 12:57:21 +0000 (Tue, 24 Jun 2008)
New Revision: 20636

Modified:
   
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerBase.java
Log:
getRequestStarterQueue():
Synchronize on the right object.
Make queue transient (more as a debugging tool than anything: this class should 
NOT be persisted, since it's transient it will NPE if it is)
Grab more than one request at a time (doh), also minor refactoring

Modified: 
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerBase.java
===================================================================
--- 
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerBase.java  
    2008-06-24 12:55:13 UTC (rev 20635)
+++ 
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerBase.java  
    2008-06-24 12:57:21 UTC (rev 20636)
@@ -235,6 +235,10 @@
        }

        void innerRegister(SendableRequest req, RandomSource random, 
ObjectContainer container) {
+               if(req.getPriorityClass() == 0) {
+                       Logger.normal(this, "Something wierd...");
+                       Logger.normal(this, "Priority "+req.getPriorityClass());
+               }
                if(logMINOR) Logger.minor(this, "Still registering "+req+" at 
prio "+req.getPriorityClass()+" retry "+req.getRetryCount()+" for 
"+req.getClientRequest());
                int retryCount = req.getRetryCount();
                addToGrabArray(req.getPriorityClass(), retryCount, 
fixRetryCount(retryCount), req.getClient(), req.getClientRequest(), req, 
random, container);