[freenet-cvs] r20300 - in branches/db4o/freenet/src/freenet: client/async node

[t...@freenetproject.org]

Author: toad
Date: 2008-06-13 12:46:29 +0000 (Fri, 13 Jun 2008)
New Revision: 20300

Modified:
   
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java
   branches/db4o/freenet/src/freenet/node/SendableGet.java
Log:
Doh, getKey() == getClientKey()

Modified: 
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java
===================================================================
--- 
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java  
    2008-06-13 12:44:59 UTC (rev 20299)
+++ 
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java  
    2008-06-13 12:46:29 UTC (rev 20300)
@@ -191,7 +191,7 @@
                        } else {
                                key = ((BaseSendableGet)req).getNodeKey(token, 
persistent() ? container : null);
                                if(req instanceof SendableGet)
-                                       ckey = 
((SendableGet)req).getClientKey(token, persistent() ? container : null);
+                                       ckey = ((SendableGet)req).getKey(token, 
persistent() ? container : null);
                                else
                                        ckey = null;
                        }

Modified: branches/db4o/freenet/src/freenet/node/SendableGet.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/SendableGet.java     2008-06-13 
12:44:59 UTC (rev 20299)
+++ branches/db4o/freenet/src/freenet/node/SendableGet.java     2008-06-13 
12:46:29 UTC (rev 20300)
@@ -151,11 +151,4 @@
         */
        public abstract void requeueAfterCooldown(Key key, long time, 
ObjectContainer container, ClientContext context);

-       /**
-        * Get the ClientKey for a specific token, so that we don't need to 
look it up on the request sender thread.
-        * @param token The token indicating this specific key.
-        * @param container The database if needed.
-        */
-       public abstract ClientKey getClientKey(Object token, ObjectContainer 
container);
-
 }