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

[to...@freenetproject.org]

Author: tommy
Date: 2008-01-16 19:24:54 +0000 (Wed, 16 Jan 2008)
New Revision: 17080

Modified:
   trunk/freenet/src/freenet/node/Node.java
Log:
Fix NPE when there is no freenet.ini

Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java    2008-01-16 19:22:08 UTC (rev 
17079)
+++ trunk/freenet/src/freenet/node/Node.java    2008-01-16 19:24:54 UTC (rev 
17080)
@@ -568,7 +568,7 @@
                L10n.setLanguage(L10n.FALLBACK_DEFAULT);
                SimpleFieldSet oldConfig = config.getSimpleFieldSet();
                //a bit of a hack...
-               if (oldConfig.getBoolean("fproxy.enabled", true))
+               if (oldConfig != null && oldConfig.getBoolean("fproxy.enabled", 
true))
                        startupPageHolder = new StartupToadletServer(executor, 
oldConfig);
                nodeNameUserAlert = new MeaningfulNodeNameUserAlert(this);
                recentlyCompletedIDs = new LRUQueue();