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

[t...@freenetproject.org]

Author: toad
Date: 2008-09-25 17:06:18 +0000 (Thu, 25 Sep 2008)
New Revision: 22835

Modified:
   branches/db4o/freenet/src/freenet/node/NodeClientCore.java
Log:
Fix more NPEs caused by reordering in NodeClientCore constructor


Modified: branches/db4o/freenet/src/freenet/node/NodeClientCore.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/NodeClientCore.java  2008-09-25 
16:47:01 UTC (rev 22834)
+++ branches/db4o/freenet/src/freenet/node/NodeClientCore.java  2008-09-25 
17:06:18 UTC (rev 22835)
@@ -294,6 +294,8 @@
                });
                tempBucketFactory = new TempBucketFactory(node.executor, 
tempFilenameGenerator, nodeConfig.getLong("maxRAMBucketSize"), 
nodeConfig.getLong("RAMBucketPoolSize"), random, node.fastWeakRandom, 
nodeConfig.getBoolean("encryptTempBuckets"));

+               archiveManager = new ArchiveManager(MAX_ARCHIVE_HANDLERS, 
MAX_CACHED_ARCHIVE_DATA, MAX_ARCHIVED_FILE_SIZE, MAX_CACHED_ELEMENTS, 
tempBucketFactory);
+               
                clientContext = new ClientContext(this);
                storeChecker.setContext(clientContext);

@@ -404,7 +406,6 @@
                        });
                
setUploadAllowedDirs(nodeConfig.getStringArr("uploadAllowedDirs"));

-               archiveManager = new ArchiveManager(MAX_ARCHIVE_HANDLERS, 
MAX_CACHED_ARCHIVE_DATA, MAX_ARCHIVED_FILE_SIZE, MAX_CACHED_ELEMENTS, 
tempBucketFactory);
                Logger.normal(this, "Initializing USK Manager");
                System.out.println("Initializing USK Manager");
                uskManager.init(container, clientContext);