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

[t...@freenetproject.org]

Author: toad
Date: 2008-02-18 22:38:12 +0000 (Mon, 18 Feb 2008)
New Revision: 18055

Modified:
   trunk/freenet/src/freenet/node/fcp/FCPServer.java
Log:
Load the serialised requests into RAM (as SFS; don't deserialise them) in the 
FCPServer constructor, not in FCPStart.
Since either way it will run at MAX_PRIORITY, it is better to do it *before* we 
start receiving packets which could be severely delayed by such activity.

Modified: trunk/freenet/src/freenet/node/fcp/FCPServer.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/FCPServer.java   2008-02-18 22:11:24 UTC 
(rev 18054)
+++ trunk/freenet/src/freenet/node/fcp/FCPServer.java   2008-02-18 22:38:12 UTC 
(rev 18055)
@@ -122,6 +122,10 @@
                globalClient = new FCPClient("Global Queue", this, null, true);

                logMINOR = Logger.shouldLog(Logger.MINOR, this);
+               
+               if(enabled && enablePersistentDownloads) {
+                       loadPersistentRequests();
+               }
        }

        private void maybeGetNetworkInterface() {
@@ -147,10 +151,6 @@
                if (this.enabled) {
                        maybeGetNetworkInterface();

-                       if(enablePersistentDownloads) {
-                               loadPersistentRequests();
-                       }
-                       
                        Logger.normal(this, "Starting FCP server on "+bindTo+ 
':' +port+ '.');
                        System.out.println("Starting FCP server on "+bindTo+ 
':' +port+ '.');