[freenet-cvs] r17143 - trunk/freenet/src/freenet/clients/http

[t...@freenetproject.org]

Author: toad
Date: 2008-01-18 15:01:57 +0000 (Fri, 18 Jan 2008)
New Revision: 17143

Modified:
   trunk/freenet/src/freenet/clients/http/SimpleToadletServer.java
Log:
Make toadlet removing and therefore hopefully the web interface work

Modified: trunk/freenet/src/freenet/clients/http/SimpleToadletServer.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/SimpleToadletServer.java     
2008-01-18 14:56:03 UTC (rev 17142)
+++ trunk/freenet/src/freenet/clients/http/SimpleToadletServer.java     
2008-01-18 15:01:57 UTC (rev 17143)
@@ -397,7 +397,7 @@
        private StartupToadlet startupToadlet;

        public void removeStartupToadlet() {
-               toadlets.remove(startupToadlet);
+               unregister(startupToadlet);
                // Not in the navbar.
        }

@@ -439,8 +439,14 @@
                }
        }

-       public void unregister(Toadlet t) {
-               
+       public synchronized void unregister(Toadlet t) {
+               for(Iterator i=toadlets.iterator();i.hasNext();) {
+                       ToadletElement e = (ToadletElement) i.next();
+                       if(e.t == t) {
+                               i.remove();
+                               return;
+                       }
+               }
        }

        public Toadlet findToadlet(URI uri) {