[freenet-cvs] r17819 - in trunk/freenet/src/freenet: clients/http node

[t...@freenetproject.org]

Author: toad
Date: 2008-02-12 14:03:36 +0000 (Tue, 12 Feb 2008)
New Revision: 17819

Modified:
   trunk/freenet/src/freenet/clients/http/SimpleToadletServer.java
   trunk/freenet/src/freenet/node/NodeClientCore.java
Log:
Only start if enabled

Modified: trunk/freenet/src/freenet/clients/http/SimpleToadletServer.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/SimpleToadletServer.java     
2008-02-12 14:02:29 UTC (rev 17818)
+++ trunk/freenet/src/freenet/clients/http/SimpleToadletServer.java     
2008-02-12 14:03:36 UTC (rev 17819)
@@ -589,4 +589,8 @@
                this.bf = tempBucketFactory;
        }

+       public boolean isEnabled() {
+               return myThread != null;
+       }
+
 }

Modified: trunk/freenet/src/freenet/node/NodeClientCore.java
===================================================================
--- trunk/freenet/src/freenet/node/NodeClientCore.java  2008-02-12 14:02:29 UTC 
(rev 17818)
+++ trunk/freenet/src/freenet/node/NodeClientCore.java  2008-02-12 14:03:36 UTC 
(rev 17819)
@@ -358,8 +358,10 @@
                        toadletContainer = toadlets;
                        toadletContainer.setCore(this);
                        toadletContainer.setBucketFactory(tempBucketFactory);
+               if(toadletContainer.isEnabled()) {
                        toadletContainer.createFproxy();
                        toadletContainer.removeStartupToadlet();
+               }

        }