Author: toad
Date: 2008-06-26 17:47:24 +0000 (Thu, 26 Jun 2008)
New Revision: 20767
Modified:
branches/db4o/freenet/src/freenet/client/async/SimpleHealingQueue.java
branches/db4o/freenet/src/freenet/node/NodeClientCore.java
Log:
Fix context.healingQueue not initialized
Modified: branches/db4o/freenet/src/freenet/client/async/SimpleHealingQueue.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/SimpleHealingQueue.java
2008-06-26 17:42:11 UTC (rev 20766)
+++ branches/db4o/freenet/src/freenet/client/async/SimpleHealingQueue.java
2008-06-26 17:47:24 UTC (rev 20767)
@@ -24,7 +24,7 @@
InsertContext ctx;
final HashMap runningInserters;
- public SimpleHealingQueue(ClientRequestScheduler scheduler,
InsertContext context, short prio, int maxRunning) {
+ public SimpleHealingQueue(InsertContext context, short prio, int
maxRunning) {
super(prio, new RequestClient() {
public boolean persistent() {
return false;
Modified: branches/db4o/freenet/src/freenet/node/NodeClientCore.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/NodeClientCore.java 2008-06-26
17:42:11 UTC (rev 20766)
+++ branches/db4o/freenet/src/freenet/node/NodeClientCore.java 2008-06-26
17:47:24 UTC (rev 20767)
@@ -227,6 +227,11 @@
tempBucketFactory = new
PaddedEphemerallyEncryptedBucketFactory(new
TempBucketFactory(tempFilenameGenerator), random, node.fastWeakRandom, 1024);
+ healingQueue = new SimpleHealingQueue(
+ new InsertContext(tempBucketFactory,
tempBucketFactory, persistentTempBucketFactory,
+ 0, 2, 1, 0, 0, new
SimpleEventProducer(),
+
!Node.DONT_CACHE_LOCAL_REQUESTS), RequestStarter.PREFETCH_PRIORITY_CLASS, 512
/* FIXME make configurable */);
+
clientContext = new ClientContext(this);
requestStarters = new RequestStarterGroup(node, this,
portNumber, random, config, throttleFS, clientContext);
clientContext.init(requestStarters);
@@ -308,11 +313,6 @@
System.out.println("Initializing USK Manager");
uskManager.init(container, clientContext);
- healingQueue = new
SimpleHealingQueue(requestStarters.chkPutScheduler,
- new InsertContext(tempBucketFactory,
tempBucketFactory, persistentTempBucketFactory,
- 0, 2, 1, 0, 0, new
SimpleEventProducer(),
-
!Node.DONT_CACHE_LOCAL_REQUESTS), RequestStarter.PREFETCH_PRIORITY_CLASS, 512
/* FIXME make configurable */);
-
nodeConfig.register("lazyResume", false, sortOrder++, true,
false, "NodeClientCore.lazyResume",
"NodeClientCore.lazyResumeLong", new
BooleanCallback() {
