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

[t...@freenetproject.org]

Author: toad
Date: 2008-07-16 22:06:23 +0000 (Wed, 16 Jul 2008)
New Revision: 21150

Modified:
   
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java
Log:
removeFetchingKeys must run at a lower priority than tripPendingKeys.

Modified: 
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java
===================================================================
--- 
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java  
    2008-07-16 22:05:23 UTC (rev 21149)
+++ 
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java  
    2008-07-16 22:06:23 UTC (rev 21150)
@@ -674,6 +674,8 @@
                        keysFetching.remove(key);
                }
                }
+               int prio = NativeThread.NORM_PRIORITY+1;
+               assert(prio < ClientRequestScheduler.TRIP_PENDING_PRIORITY);
                if(req != null && req.isPersistent()) {
                sched.clientContext.jobRunner.queue(new DBJob() {
                        public void run(ObjectContainer container, 
ClientContext context) {
@@ -682,7 +684,7 @@
                        public String toString() {
                                return "Delete "+req;
                        }
-               }, NativeThread.NORM_PRIORITY+1, false);
+               }, prio, false);
                }
        }