[freenet-cvs] r10240 - trunk/freenet/src/freenet/node/fcp

[t...@freenetproject.org]

Author: toad
Date: 2006-08-22 19:38:27 +0000 (Tue, 22 Aug 2006)
New Revision: 10240

Modified:
   trunk/freenet/src/freenet/node/fcp/FCPClient.java
   trunk/freenet/src/freenet/node/fcp/FCPServer.java
Log:
Non-global persistent requests were not being restarted on startup.

Modified: trunk/freenet/src/freenet/node/fcp/FCPClient.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/FCPClient.java   2006-08-22 19:08:34 UTC 
(rev 10239)
+++ trunk/freenet/src/freenet/node/fcp/FCPClient.java   2006-08-22 19:38:27 UTC 
(rev 10240)
@@ -130,6 +130,7 @@
        }

        public void register(ClientRequest cg, boolean startLater) throws 
IdentifierCollisionException {
+               Logger.minor(this, "Registering 
"+cg.getIdentifier()+(startLater ? " to start later" : ""));
                synchronized(this) {
                        String ident = cg.getIdentifier();
                        ClientRequest old = (ClientRequest) 
clientRequestsByIdentifier.get(ident);

Modified: trunk/freenet/src/freenet/node/fcp/FCPServer.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/FCPServer.java   2006-08-22 19:08:34 UTC 
(rev 10239)
+++ trunk/freenet/src/freenet/node/fcp/FCPServer.java   2006-08-22 19:38:27 UTC 
(rev 10240)
@@ -693,6 +693,13 @@
         */
        public void finishStart() {
                this.globalClient.finishStart();
+               
+               Iterator i = clientsByName.values().iterator();
+               for(;i.hasNext();) {
+                       FCPClient client = (FCPClient) i.next();
+                       client.finishStart();
+               }
+               
                if(enablePersistentDownloads)
                        startPersister();
                canStartPersister = true;