Author: toad
Date: 2008-09-25 16:47:01 +0000 (Thu, 25 Sep 2008)
New Revision: 22834
Modified:
branches/db4o/freenet/src/freenet/client/async/ClientContext.java
branches/db4o/freenet/src/freenet/node/NodeClientCore.java
Log:
Fix NPEs
Modified: branches/db4o/freenet/src/freenet/client/async/ClientContext.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/ClientContext.java
2008-09-25 01:24:43 UTC (rev 22833)
+++ branches/db4o/freenet/src/freenet/client/async/ClientContext.java
2008-09-25 16:47:01 UTC (rev 22834)
@@ -59,7 +59,9 @@
this.random = core.random;
archiveManager = core.archiveManager;
this.persistentBucketFactory = core.persistentTempBucketFactory;
+ if(persistentBucketFactory == null) throw new
NullPointerException();
this.tempBucketFactory = core.tempBucketFactory;
+ if(tempBucketFactory == null) throw new NullPointerException();
this.healingQueue = core.getHealingQueue();
this.uskManager = core.uskManager;
fastWeakRandom = core.node.fastWeakRandom;
Modified: branches/db4o/freenet/src/freenet/node/NodeClientCore.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/NodeClientCore.java 2008-09-25
01:24:43 UTC (rev 22833)
+++ branches/db4o/freenet/src/freenet/node/NodeClientCore.java 2008-09-25
16:47:01 UTC (rev 22834)
@@ -249,12 +249,6 @@
throw new
NodeInitException(NodeInitException.EXIT_BAD_TEMP_DIR, msg);
}
- clientContext = new ClientContext(this);
- storeChecker.setContext(clientContext);
- requestStarters = new RequestStarterGroup(node, this,
portNumber, random, config, throttleFS, clientContext);
- clientContext.init(requestStarters);
- InsertCompressor.load(container, clientContext);
-
nodeConfig.register("maxRAMBucketSize", "128KiB", sortOrder++,
true, false, "NodeClientCore.maxRAMBucketSize",
"NodeClientCore.maxRAMBucketSizeLong", new LongCallback() {
@Override
@@ -300,6 +294,13 @@
});
tempBucketFactory = new TempBucketFactory(node.executor,
tempFilenameGenerator, nodeConfig.getLong("maxRAMBucketSize"),
nodeConfig.getLong("RAMBucketPoolSize"), random, node.fastWeakRandom,
nodeConfig.getBoolean("encryptTempBuckets"));
+ clientContext = new ClientContext(this);
+ storeChecker.setContext(clientContext);
+
+ requestStarters = new RequestStarterGroup(node, this,
portNumber, random, config, throttleFS, clientContext);
+ clientContext.init(requestStarters);
+ InsertCompressor.load(container, clientContext);
+
healingQueue = new SimpleHealingQueue(
new InsertContext(tempBucketFactory,
tempBucketFactory, persistentTempBucketFactory,
0, 2, 1, 0, 0, new
SimpleEventProducer(),
