Author: toad
Date: 2008-06-13 17:16:32 +0000 (Fri, 13 Jun 2008)
New Revision: 20318
Modified:
branches/db4o/freenet/src/freenet/client/async/BaseSingleFileFetcher.java
branches/db4o/freenet/src/freenet/client/async/OfferedKeysList.java
branches/db4o/freenet/src/freenet/node/BaseSendableGet.java
branches/db4o/freenet/src/freenet/node/NodeClientCore.java
Log:
More fixes
Modified:
branches/db4o/freenet/src/freenet/client/async/BaseSingleFileFetcher.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/BaseSingleFileFetcher.java
2008-06-13 17:14:28 UTC (rev 20317)
+++ branches/db4o/freenet/src/freenet/client/async/BaseSingleFileFetcher.java
2008-06-13 17:16:32 UTC (rev 20318)
@@ -51,7 +51,7 @@
return keys[0];
}
- public boolean hasValidKeys(KeysFetchingLocally fetching,
ObjectContainer container) {
+ public boolean hasValidKeys(KeysFetchingLocally fetching,
ObjectContainer container, ClientContext context) {
return !fetching.hasKey(key.getNodeKey());
}
Modified: branches/db4o/freenet/src/freenet/client/async/OfferedKeysList.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/OfferedKeysList.java
2008-06-13 17:14:28 UTC (rev 20317)
+++ branches/db4o/freenet/src/freenet/client/async/OfferedKeysList.java
2008-06-13 17:16:32 UTC (rev 20318)
@@ -102,7 +102,7 @@
return null;
}
- public synchronized boolean hasValidKeys(KeysFetchingLocally fetching,
ObjectContainer container) {
+ public synchronized boolean hasValidKeys(KeysFetchingLocally fetching,
ObjectContainer container, ClientContext context) {
assert(keysList.size() == keys.size());
if(keys.size() == 1) {
// Shortcut the common case
Modified: branches/db4o/freenet/src/freenet/node/BaseSendableGet.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/BaseSendableGet.java 2008-06-13
17:14:28 UTC (rev 20317)
+++ branches/db4o/freenet/src/freenet/node/BaseSendableGet.java 2008-06-13
17:16:32 UTC (rev 20318)
@@ -2,6 +2,7 @@
import com.db4o.ObjectContainer;
+import freenet.client.async.ClientContext;
import freenet.keys.Key;
public abstract class BaseSendableGet extends SendableRequest {
@@ -9,6 +10,6 @@
/** Get a numbered key to fetch. */
public abstract Key getNodeKey(Object token, ObjectContainer container);
- public abstract boolean hasValidKeys(KeysFetchingLocally fetching,
ObjectContainer container);
+ public abstract boolean hasValidKeys(KeysFetchingLocally fetching,
ObjectContainer container, ClientContext context);
}
Modified: branches/db4o/freenet/src/freenet/node/NodeClientCore.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/NodeClientCore.java 2008-06-13
17:14:28 UTC (rev 20317)
+++ branches/db4o/freenet/src/freenet/node/NodeClientCore.java 2008-06-13
17:16:32 UTC (rev 20318)
@@ -306,7 +306,7 @@
healingQueue = new
SimpleHealingQueue(requestStarters.chkPutScheduler,
new InsertContext(tempBucketFactory,
tempBucketFactory, persistentTempBucketFactory,
- random, 0, 2, 1, 0, 0, new
SimpleEventProducer(),
+ 0, 2, 1, 0, 0, new
SimpleEventProducer(),
!Node.DONT_CACHE_LOCAL_REQUESTS, uskManager, node.executor),
RequestStarter.PREFETCH_PRIORITY_CLASS, 512 /* FIXME make configurable */);
nodeConfig.register("lazyResume", false, sortOrder++, true,
false, "NodeClientCore.lazyResume",
