[freenet-cvs] r9685 - in trunk/freenet/src/freenet/node: . fcp

[t...@freenetproject.org]

Author: toad
Date: 2006-07-20 22:41:59 +0000 (Thu, 20 Jul 2006)
New Revision: 9685

Modified:
   trunk/freenet/src/freenet/node/Version.java
   trunk/freenet/src/freenet/node/fcp/ClientRequest.java
   trunk/freenet/src/freenet/node/fcp/FCPServer.java
Log:
887: Fix nasty bug in previous build related to persistence.

Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2006-07-20 22:32:52 UTC (rev 
9684)
+++ trunk/freenet/src/freenet/node/Version.java 2006-07-20 22:41:59 UTC (rev 
9685)
@@ -18,7 +18,7 @@
        public static final String protocolVersion = "1.0";

        /** The build number of the current revision */
-       private static final int buildNumber = 886;
+       private static final int buildNumber = 887;

        /** Oldest build of Fred we will talk to */
        private static final int oldLastGoodBuild = 870;

Modified: trunk/freenet/src/freenet/node/fcp/ClientRequest.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ClientRequest.java       2006-07-20 
22:32:52 UTC (rev 9684)
+++ trunk/freenet/src/freenet/node/fcp/ClientRequest.java       2006-07-20 
22:41:59 UTC (rev 9685)
@@ -158,8 +158,7 @@
                                return cp;
                        } else if(type.equals("PUTDIR")) {
                                ClientPutDir cp = new ClientPutDir(fs, client);
-                               // FIXME ,true when it doesn't self-start and 
supports resuming.
-                               client.register(cp, false);
+                               client.register(cp, true);
                                return cp;
                        } else {
                                Logger.error(ClientRequest.class, "Unrecognized 
type: "+type);

Modified: trunk/freenet/src/freenet/node/fcp/FCPServer.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/FCPServer.java   2006-07-20 22:32:52 UTC 
(rev 9684)
+++ trunk/freenet/src/freenet/node/fcp/FCPServer.java   2006-07-20 22:41:59 UTC 
(rev 9685)
@@ -64,6 +64,7 @@
        public InserterContext defaultInsertContext;
        public static final int QUEUE_MAX_RETRIES = -1;
        public static final long QUEUE_MAX_DATA_SIZE = Long.MAX_VALUE;
+       private boolean canStartPersister = false;

        private void startPersister() {
                Thread t = new Thread(persister = new FCPServerPersister(), 
"FCP request persistence handler");
@@ -105,7 +106,6 @@

                        if(enablePersistentDownloads) {
                                loadPersistentRequests();
-                               startPersister();
                        }

                        Logger.normal(this, "Starting FCP server on 
"+bindTo+":"+port+".");
@@ -359,7 +359,8 @@
                        if(set) {
                                if(!haveLoadedPersistentRequests)
                                        loadPersistentRequests();
-                               startPersister();
+                               if(canStartPersister)
+                                       startPersister();
                        } else {
                                killPersister();
                        }
@@ -669,6 +670,9 @@
         */
        public void finishStart() {
                this.globalClient.finishStart();
+               if(enablePersistentDownloads)
+                       startPersister();
+               canStartPersister = true;
        }

 }