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

[toad]

Author: toad
Date: 2009-02-03 20:39:41 +0000 (Tue, 03 Feb 2009)
New Revision: 25516

Modified:
   branches/db4o/freenet/src/freenet/client/async/OfferedKeysList.java
   branches/db4o/freenet/src/freenet/node/BaseSendableGet.java
   branches/db4o/freenet/src/freenet/node/SendableGet.java
Log:
Fix ClassCastException, fix type of token


Modified: branches/db4o/freenet/src/freenet/client/async/OfferedKeysList.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/OfferedKeysList.java 
2009-02-03 20:39:19 UTC (rev 25515)
+++ branches/db4o/freenet/src/freenet/client/async/OfferedKeysList.java 
2009-02-03 20:39:41 UTC (rev 25516)
@@ -204,8 +204,8 @@
        }
 
        @Override
-       public Key getNodeKey(Object token, ObjectContainer container) {
-               return (Key) token;
+       public Key getNodeKey(SendableRequestItem token, ObjectContainer 
container) {
+               return ((MySendableRequestItem) token).key;
        }
 
        public boolean isSSK() {

Modified: branches/db4o/freenet/src/freenet/node/BaseSendableGet.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/BaseSendableGet.java 2009-02-03 
20:39:19 UTC (rev 25515)
+++ branches/db4o/freenet/src/freenet/node/BaseSendableGet.java 2009-02-03 
20:39:41 UTC (rev 25516)
@@ -12,7 +12,7 @@
        }
 
        /** Get a numbered key to fetch. */
-       public abstract Key getNodeKey(Object token, ObjectContainer container);
+       public abstract Key getNodeKey(SendableRequestItem token, 
ObjectContainer container);
        
        public abstract boolean hasValidKeys(KeysFetchingLocally fetching, 
ObjectContainer container, ClientContext context);
 

Modified: branches/db4o/freenet/src/freenet/node/SendableGet.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/SendableGet.java     2009-02-03 
20:39:19 UTC (rev 25515)
+++ branches/db4o/freenet/src/freenet/node/SendableGet.java     2009-02-03 
20:39:41 UTC (rev 25516)
@@ -26,7 +26,7 @@
        public abstract ClientKey getKey(Object token, ObjectContainer 
container);
        
        @Override
-       public Key getNodeKey(Object token, ObjectContainer container) {
+       public Key getNodeKey(SendableRequestItem token, ObjectContainer 
container) {
                ClientKey key = getKey(token, container);
                if(key == null) return null;
                return key.getNodeKey();

_______________________________________________
cvs mailing list
cvs@freenetproject.org
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs