[freenet-cvs] r22994 - branches/db4o/freenet/src/freenet/node

[t...@freenetproject.org]

Author: toad
Date: 2008-10-17 22:06:13 +0000 (Fri, 17 Oct 2008)
New Revision: 22994

Modified:
   branches/db4o/freenet/src/freenet/node/NodeClientCore.java
Log:
Bucket factory arguments to ClientContext were the wrong way around.
Activation w.r.t. startup jobs.


Modified: branches/db4o/freenet/src/freenet/node/NodeClientCore.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/NodeClientCore.java  2008-10-17 
22:04:31 UTC (rev 22993)
+++ branches/db4o/freenet/src/freenet/node/NodeClientCore.java  2008-10-17 
22:06:13 UTC (rev 22994)
@@ -305,7 +305,7 @@
                                                0, 2, 1, 0, 0, new 
SimpleEventProducer(),
                                                
!Node.DONT_CACHE_LOCAL_REQUESTS), RequestStarter.PREFETCH_PRIORITY_CLASS, 512 
/* FIXME make configurable */);

-               clientContext = new ClientContext(this, fecQueue, 
node.executor, backgroundBlockEncoder, archiveManager, tempBucketFactory, 
persistentTempBucketFactory, healingQueue, uskManager, random, 
node.fastWeakRandom, node.getTicker(), persistentFilenameGenerator, 
persistentFilenameGenerator);
+               clientContext = new ClientContext(this, fecQueue, 
node.executor, backgroundBlockEncoder, archiveManager, 
persistentTempBucketFactory, tempBucketFactory, healingQueue, uskManager, 
random, node.fastWeakRandom, node.getTicker(), persistentFilenameGenerator, 
persistentFilenameGenerator);
                storeChecker.setContext(clientContext);

                requestStarters = new RequestStarterGroup(node, this, 
portNumber, random, config, throttleFS, clientContext);
@@ -576,6 +576,7 @@
                        public void run(ObjectContainer container, 
ClientContext context) {
                                for(int i=0;i<startupDatabaseJobs.length;i++) {
                                        try {
+                                               
container.activate(startupDatabaseJobs[i], 1);
                                                
startupDatabaseJobs[i].run(container, context);
                                        } catch (Throwable t) {
                                                Logger.error(this, "Caught 
"+t+" in startup job "+startupDatabaseJobs[i], t);