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

[t...@freenetproject.org]

Author: toad
Date: 2008-07-04 13:42:12 +0000 (Fri, 04 Jul 2008)
New Revision: 20983

Modified:
   branches/db4o/freenet/src/freenet/client/async/ClientRequestScheduler.java
Log:
Both the transient queue and the persistent queue might affect persistent 
requests, so both must be run on the database thread

Modified: 
branches/db4o/freenet/src/freenet/client/async/ClientRequestScheduler.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/ClientRequestScheduler.java  
2008-07-04 13:40:45 UTC (rev 20982)
+++ branches/db4o/freenet/src/freenet/client/async/ClientRequestScheduler.java  
2008-07-04 13:42:12 UTC (rev 20983)
@@ -774,14 +774,14 @@
        private final DBJob moveFromCooldownJob = new DBJob() {

                public void run(ObjectContainer container, ClientContext 
context) {
-                       if(moveKeysFromCooldownQueue(persistentCooldownQueue, 
true, selectorContainer))
+                       if(moveKeysFromCooldownQueue(persistentCooldownQueue, 
true, selectorContainer) ||
+                                       
moveKeysFromCooldownQueue(transientCooldownQueue, true, selectorContainer))
                                starter.wakeUp();
                }

        };

        public void moveKeysFromCooldownQueue() {
-               moveKeysFromCooldownQueue(transientCooldownQueue, false, null);
                jobRunner.queue(moveFromCooldownJob, 
NativeThread.NORM_PRIORITY, true);
        }