[freenet-cvs] r13817 - trunk/freenet/src/freenet/node

[t...@freenetproject.org]

Author: toad
Date: 2007-06-28 21:03:49 +0000 (Thu, 28 Jun 2007)
New Revision: 13817

Modified:
   trunk/freenet/src/freenet/node/Node.java
Log:
NPE fixes

Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java    2007-06-28 20:57:14 UTC (rev 
13816)
+++ trunk/freenet/src/freenet/node/Node.java    2007-06-28 21:03:49 UTC (rev 
13817)
@@ -561,8 +561,6 @@
                runningSSKGetUIDs = new HashSet();
                runningCHKPutUIDs = new HashSet();
                runningSSKPutUIDs = new HashSet();
-               dnsr = new DNSRequester(this);
-               ps = new PacketSender(this);
                bootID = random.nextLong();

                buildOldAgeUserAlert = new BuildOldAgeUserAlert();
@@ -604,10 +602,6 @@
                decrementAtMax = random.nextDouble() <= DECREMENT_AT_MAX_PROB;
                decrementAtMin = random.nextDouble() <= DECREMENT_AT_MIN_PROB;

-               // FIXME maybe these configs should actually be under a node.ip 
subconfig?
-               ipDetector = new NodeIPDetector(this, darknetCrypto);
-               sortOrder = ipDetector.registerConfigs(nodeConfig, sortOrder);
-               
                // Determine where to bind to

                usm = new MessageCore();
@@ -615,6 +609,13 @@
                // Determine the port number

                darknetCrypto = new NodeCrypto(nodeConfig, sortOrder++, this);
+
+               // Must be created after darknetCrypto
+               dnsr = new DNSRequester(this);
+               ps = new PacketSender(this);
+               // FIXME maybe these configs should actually be under a node.ip 
subconfig?
+               ipDetector = new NodeIPDetector(this, darknetCrypto);
+               sortOrder = ipDetector.registerConfigs(nodeConfig, sortOrder);

                Logger.normal(Node.class, "Creating node...");