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

[nextg...@freenetproject.org]

Author: nextgens
Date: 2006-05-18 10:05:10 +0000 (Thu, 18 May 2006)
New Revision: 8759

Modified:
   trunk/freenet/src/freenet/node/TestnetHandler.java
Log:
Fixes an NPE (TestnetHandler wasn't initialized when we stored it)

Modified: trunk/freenet/src/freenet/node/TestnetHandler.java
===================================================================
--- trunk/freenet/src/freenet/node/TestnetHandler.java  2006-05-18 09:46:54 UTC 
(rev 8758)
+++ trunk/freenet/src/freenet/node/TestnetHandler.java  2006-05-18 10:05:10 UTC 
(rev 8759)
@@ -219,19 +219,19 @@


        static class TestnetPortNumberCallback implements IntCallback {
-               TestnetHandler th;
+               Node node;

                TestnetPortNumberCallback(Node n){
-                       th=n.testnetHandler;
+                       this.node = n;
                }

                public int get() {
-                       return th.getPort();
+                       return node.testnetHandler.getPort();
                }

                public void set(int val) throws InvalidConfigValueException {
                        if(val == get()) return;
-                       th.rebind(val);
+                       node.testnetHandler.rebind(val);
                }
        }       

@@ -250,10 +250,10 @@

                testnetConfig.register("port", node.portNumber+1000, 2, true, 
"Testnet port", "Testnet port number (-1 = listenPort+1000)",
                                new TestnetPortNumberCallback(node));
+
+               int port = testnetConfig.getInt("port");

                testnetConfig.finishedInitialization();
-               
-               int port = testnetConfig.getInt("port");
                return new TestnetHandler(node, port);
         } else return null;
        }