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

[t...@freenetproject.org]

Author: toad
Date: 2008-10-10 16:35:26 +0000 (Fri, 10 Oct 2008)
New Revision: 22982

Modified:
   branches/db4o/freenet/src/freenet/node/NodeClientCore.java
Log:
mainExecutor should be node.executor, not clientDatabaseExecutor! Probably a 
merging bug.
We were already trying to compress off-thread, but this is why it wasn't 
happening.


Modified: branches/db4o/freenet/src/freenet/node/NodeClientCore.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/NodeClientCore.java  2008-10-10 
14:59:12 UTC (rev 22981)
+++ branches/db4o/freenet/src/freenet/node/NodeClientCore.java  2008-10-10 
16:35:26 UTC (rev 22982)
@@ -63,7 +63,6 @@
 import freenet.support.OOMHandler;
 import freenet.support.OOMHook;
 import freenet.support.PrioritizedSerialExecutor;
-import freenet.support.SerialExecutor;
 import freenet.support.SimpleFieldSet;
 import freenet.support.api.BooleanCallback;
 import freenet.support.api.Bucket;
@@ -301,7 +300,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, 
clientDatabaseExecutor, backgroundBlockEncoder, archiveManager, 
persistentTempBucketFactory, persistentTempBucketFactory, healingQueue, 
uskManager, random, node.fastWeakRandom, node.getTicker(), 
persistentFilenameGenerator, persistentFilenameGenerator);
+               clientContext = new ClientContext(this, fecQueue, 
node.executor, backgroundBlockEncoder, archiveManager, 
persistentTempBucketFactory, persistentTempBucketFactory, healingQueue, 
uskManager, random, node.fastWeakRandom, node.getTicker(), 
persistentFilenameGenerator, persistentFilenameGenerator);
                storeChecker.setContext(clientContext);

                requestStarters = new RequestStarterGroup(node, this, 
portNumber, random, config, throttleFS, clientContext);