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

[t...@freenetproject.org]

Author: toad
Date: 2008-10-16 19:26:14 +0000 (Thu, 16 Oct 2008)
New Revision: 22990

Modified:
   branches/db4o/freenet/src/freenet/node/NodeClientCore.java
Log:
Temp buckets should not be persistent!


Modified: branches/db4o/freenet/src/freenet/node/NodeClientCore.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/NodeClientCore.java  2008-10-16 
11:10:19 UTC (rev 22989)
+++ branches/db4o/freenet/src/freenet/node/NodeClientCore.java  2008-10-16 
19:26:14 UTC (rev 22990)
@@ -245,7 +245,7 @@
                try {
                        File dir = new 
File(nodeConfig.getString("persistentTempDir"));
                        String prefix = "freenet-temp-";
-                       persistentTempBucketFactory = 
PersistentTempBucketFactory.load(dir, prefix, random, node.fastWeakRandom, 
container, node.nodeDBHandle, 
nodeConfig.getBoolean("encryptPersistentTempBuckets"));
+                       persistentTempBucketFactory = 
PersistentTempBucketFactory.load(dir, prefix, random, node.fastWeakRandom, 
container, node.nodeDBHandle, 
nodeConfig.getBoolean("encryptPersistentTempBuckets"), this);
                        persistentTempBucketFactory.init(dir, prefix, random, 
node.fastWeakRandom);
                        persistentFilenameGenerator = 
persistentTempBucketFactory.fg;
                } catch(IOException e2) {
@@ -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, 
persistentTempBucketFactory, persistentTempBucketFactory, healingQueue, 
uskManager, random, node.fastWeakRandom, node.getTicker(), 
persistentFilenameGenerator, persistentFilenameGenerator);
+               clientContext = new ClientContext(this, fecQueue, 
node.executor, backgroundBlockEncoder, archiveManager, tempBucketFactory, 
persistentTempBucketFactory, healingQueue, uskManager, random, 
node.fastWeakRandom, node.getTicker(), persistentFilenameGenerator, 
persistentFilenameGenerator);
                storeChecker.setContext(clientContext);

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