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

[t...@freenetproject.org]

Author: toad
Date: 2007-12-22 14:56:03 +0000 (Sat, 22 Dec 2007)
New Revision: 16780

Modified:
   trunk/freenet/src/freenet/node/Node.java
Log:
Fix NPE when there is no freenet.ini. This doesn't affect normal node installs, 
but may impact on some packages.

Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java    2007-12-22 14:51:28 UTC (rev 
16779)
+++ trunk/freenet/src/freenet/node/Node.java    2007-12-22 14:56:03 UTC (rev 
16780)
@@ -687,7 +687,7 @@

                // Determine the port number
                // @see #191
-               if("-1".equals(oldConfig.get("node.listenPort")))
+               if(oldConfig != null && 
"-1".equals(oldConfig.get("node.listenPort")))
                        throw new 
NodeInitException(NodeInitException.EXIT_COULD_NOT_BIND_USM, "Your freenet.ini 
file is corrupted! 'listenPort=-1'");
                NodeCryptoConfig darknetConfig = new 
NodeCryptoConfig(nodeConfig, sortOrder++, false);
                sortOrder += NodeCryptoConfig.OPTION_COUNT;