Author: toad
Date: 2008-06-13 12:44:59 +0000 (Fri, 13 Jun 2008)
New Revision: 20299
Modified:
branches/db4o/freenet/src/freenet/client/async/OfferedKeysList.java
branches/db4o/freenet/src/freenet/node/SimpleSendableInsert.java
Log:
Related fixes
Modified: branches/db4o/freenet/src/freenet/client/async/OfferedKeysList.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/OfferedKeysList.java
2008-06-13 12:43:42 UTC (rev 20298)
+++ branches/db4o/freenet/src/freenet/client/async/OfferedKeysList.java
2008-06-13 12:44:59 UTC (rev 20299)
@@ -9,6 +9,7 @@
import com.db4o.ObjectContainer;
import freenet.crypt.RandomSource;
+import freenet.keys.ClientKey;
import freenet.keys.Key;
import freenet.node.BaseSendableGet;
import freenet.node.KeysFetchingLocally;
@@ -141,7 +142,7 @@
Logger.error(this, "Internal error: "+t, t);
}
- public boolean send(NodeClientCore node, RequestScheduler sched, Object
keyNum) {
+ public boolean send(NodeClientCore node, RequestScheduler sched, Object
keyNum, ClientKey ckey) {
Key key = (Key) keyNum;
// Have to cache it in order to propagate it; FIXME
// Don't let a node force us to start a real request for a
specific key.
Modified: branches/db4o/freenet/src/freenet/node/SimpleSendableInsert.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/SimpleSendableInsert.java
2008-06-13 12:43:42 UTC (rev 20298)
+++ branches/db4o/freenet/src/freenet/node/SimpleSendableInsert.java
2008-06-13 12:44:59 UTC (rev 20299)
@@ -9,6 +9,7 @@
import freenet.client.async.ClientRequestScheduler;
import freenet.client.async.ClientRequester;
import freenet.keys.CHKBlock;
+import freenet.keys.ClientKey;
import freenet.keys.KeyBlock;
import freenet.keys.SSKBlock;
import freenet.support.Logger;
@@ -66,7 +67,7 @@
return 0;
}
- public boolean send(NodeClientCore core, RequestScheduler sched, Object
keyNum) {
+ public boolean send(NodeClientCore core, RequestScheduler sched, Object
keyNum, ClientKey ckey) {
// Ignore keyNum, key, since this is a single block
boolean logMINOR = Logger.shouldLog(Logger.MINOR, this);
try {
