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

[robert at freenetproject.org]

Author: robert
Date: 2008-01-04 22:57:51 +0000 (Fri, 04 Jan 2008)
New Revision: 16896

Modified:
   trunk/freenet/src/freenet/node/Node.java
Log:
don't launch StartupToadletServer if it looks like fproxy is disabled


Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java	2008-01-04 22:52:09 UTC (rev 16895)
+++ trunk/freenet/src/freenet/node/Node.java	2008-01-04 22:57:51 UTC (rev 16896)
@@ -548,7 +548,9 @@
 		// Will be set up properly afterwards
 		L10n.setLanguage(L10n.FALLBACK_DEFAULT);
 		SimpleFieldSet oldConfig = config.getSimpleFieldSet();
-		startupPageHolder = new StartupToadletServer(executor, oldConfig);
+		//a bit of a hack...
+		if (oldConfig.getBoolean("fproxy.enabled", true))
+			startupPageHolder = new StartupToadletServer(executor, oldConfig);
 		nodeNameUserAlert = new MeaningfulNodeNameUserAlert(this);
 		recentlyCompletedIDs = new LRUQueue();
 		this.config = config;
@@ -2899,7 +2901,8 @@
 	}
         
         protected void killStartupToadlet() throws IOException {
-            startupPageHolder.kill();
+			if (startupPageHolder!=null)
+				startupPageHolder.kill();
             // Give it a chance to be GCed
             startupPageHolder = null;
         }