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

[t...@freenetproject.org]

Author: toad
Date: 2006-01-05 19:11:47 +0000 (Thu, 05 Jan 2006)
New Revision: 7760

Modified:
   trunk/freenet/src/freenet/node/Node.java
   trunk/freenet/src/freenet/node/TestnetHandler.java
   trunk/freenet/src/freenet/node/Version.java
Log:
314:
Fix possible testnet NPE.

Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java    2006-01-05 18:56:15 UTC (rev 
7759)
+++ trunk/freenet/src/freenet/node/Node.java    2006-01-05 19:11:47 UTC (rev 
7760)
@@ -427,6 +427,7 @@
                // FIXME reenable the above
                insertThrottle = new RequestThrottle(10000, 2.0F);
                insertStarter = new RequestStarter(insertThrottle, "Insert 
starter ("+portNumber+")");
+               testnetHandler.start();
                System.err.println("Created Node on port "+port);
     }


Modified: trunk/freenet/src/freenet/node/TestnetHandler.java
===================================================================
--- trunk/freenet/src/freenet/node/TestnetHandler.java  2006-01-05 18:56:15 UTC 
(rev 7759)
+++ trunk/freenet/src/freenet/node/TestnetHandler.java  2006-01-05 19:11:47 UTC 
(rev 7760)
@@ -44,6 +44,9 @@
                System.err.println("We repeat: YOU HAVE NO ANONYMITY 
WHATSOEVER. DO NOT POST ANYTHING YOU DO NOT WANT TO BE ASSOCIATED WITH.");
                System.err.println("If you want a real freenet node, with 
anonymity, turn off testnet mode.");
                System.err.println("Note, this node will not connect to 
non-testnet nodes, for security reasons. You can of course run a testnet node 
and a non-testnet node separately.");
+       }
+
+       public void start() {
                serverThread = new Thread(this, "Testnet handler thread");
                serverThread.setDaemon(true);
                serverThread.start();
@@ -51,7 +54,7 @@
        }

        private final Node node;
-       private final Thread serverThread;
+       private Thread serverThread;
        private final int testnetPort;

        public void run() {

Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2006-01-05 18:56:15 UTC (rev 
7759)
+++ trunk/freenet/src/freenet/node/Version.java 2006-01-05 19:11:47 UTC (rev 
7760)
@@ -20,7 +20,7 @@
        public static final String protocolVersion = "1.0";

        /** The build number of the current revision */
-       public static final int buildNumber = 313;
+       public static final int buildNumber = 314;

        /** Oldest build of Fred we will talk to */
        public static final int lastGoodBuild = 310;