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

[t...@freenetproject.org]

Author: toad
Date: 2008-07-04 13:58:46 +0000 (Fri, 04 Jul 2008)
New Revision: 20992

Modified:
   branches/db4o/freenet/src/freenet/client/async/ClientRequestScheduler.java
   
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerBase.java
Log:
addPendingKey() takes a Key not a ClientKey

Modified: 
branches/db4o/freenet/src/freenet/client/async/ClientRequestScheduler.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/ClientRequestScheduler.java  
2008-07-04 13:57:19 UTC (rev 20991)
+++ branches/db4o/freenet/src/freenet/client/async/ClientRequestScheduler.java  
2008-07-04 13:58:46 UTC (rev 20992)
@@ -327,7 +327,7 @@
                                                block = node.fetchKey(key, 
dontCache);
                                        if(block == null) {
                                                if(!persistent) {
-                                                       
schedTransient.addPendingKey(key, getter, null);
+                                                       
schedTransient.addPendingKey(key.getNodeKey(), getter, null);
                                                } // If persistent, when it is 
registered (in a later job) the keys will be added first.
                                        } else {
                                                if(logMINOR)
@@ -441,9 +441,9 @@
                        if(!databaseExecutor.onThread()) {
                                throw new IllegalStateException("Not on 
database thread!");
                        }
-                       schedCore.addPendingKey(key, getter, selectorContainer);
+                       schedCore.addPendingKey(key.getNodeKey(), getter, 
selectorContainer);
                } else
-                       schedTransient.addPendingKey(key, getter, null);
+                       schedTransient.addPendingKey(key.getNodeKey(), getter, 
null);
        }

        private synchronized ChosenRequest removeFirst(ObjectContainer 
container, boolean transientOnly, boolean notTransient) {

Modified: 
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerBase.java
===================================================================
--- 
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerBase.java  
    2008-07-04 13:57:19 UTC (rev 20991)
+++ 
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerBase.java  
    2008-07-04 13:58:46 UTC (rev 20992)
@@ -74,11 +74,10 @@
         * Register a pending key to an already-registered request. This is 
necessary if we've
         * already registered a SendableGet, but we later add some more keys to 
it.
         */
-       void addPendingKey(ClientKey key, SendableGet getter, ObjectContainer 
container) {
+       void addPendingKey(Key nodeKey, SendableGet getter, ObjectContainer 
container) {
                logMINOR = Logger.shouldLog(Logger.MINOR, 
ClientRequestSchedulerBase.class);
                if(logMINOR)
-                       Logger.minor(this, "Adding pending key "+key+" for 
"+getter);
-               Key nodeKey = key.getNodeKey();
+                       Logger.minor(this, "Adding pending key "+nodeKey+" for 
"+getter);
                synchronized(pendingKeys) {
                        Object o = pendingKeys.get(nodeKey);
                        if(o == null) {
@@ -392,7 +391,7 @@
                                        Logger.minor(this, "No key for "+tok+" 
for "+getter+" - already finished?");
                                        continue;
                        } else {
-                               addPendingKey(key, getter, container);
+                               addPendingKey(key.getNodeKey(), getter, 
container);
                        }
                }
        }