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

[t...@freenetproject.org]

Author: toad
Date: 2007-10-25 15:26:00 +0000 (Thu, 25 Oct 2007)
New Revision: 15553

Modified:
   trunk/freenet/src/freenet/node/Node.java
Log:
Fix startup order to prevent NoSuchElementException's

Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java    2007-10-25 00:28:20 UTC (rev 
15552)
+++ trunk/freenet/src/freenet/node/Node.java    2007-10-25 15:26:00 UTC (rev 
15553)
@@ -1324,14 +1324,14 @@

                dispatcher.start(nodeStats); // must be before usm
                dnsr.start();
-               ps.start(nodeStats);
                peers.start(); // must be before usm
                nodeStats.start();

-               usm.start(ps);
                darknetCrypto.start(disableHangCheckers);
                if(opennet != null)
                        opennet.start();
+               ps.start(nodeStats);
+               usm.start(ps);

                if(isUsingWrapper()) {
                        Logger.normal(this, "Using wrapper correctly: 
"+nodeStarter);