Author: toad
Date: 2008-06-16 17:01:12 +0000 (Mon, 16 Jun 2008)
New Revision: 20373
Modified:
branches/db4o/freenet/src/freenet/node/fcp/FCPConnectionHandler.java
branches/db4o/freenet/src/freenet/node/fcp/FCPServer.java
Log:
We don't need to store persistent requests here (we can't anyway) ... either it
will register completely (or at least be added to a queue to register
completely on the next startup), or it won't.
Modified: branches/db4o/freenet/src/freenet/node/fcp/FCPConnectionHandler.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/fcp/FCPConnectionHandler.java
2008-06-16 16:58:30 UTC (rev 20372)
+++ branches/db4o/freenet/src/freenet/node/fcp/FCPConnectionHandler.java
2008-06-16 17:01:12 UTC (rev 20373)
@@ -230,12 +230,6 @@
outputHandler.queue(msg);
return;
} else {
- // Register before starting, because it may complete
immediately, and if it does,
- // we may end up with it not being removable because it
wasn't registered!
- if(cg.isPersistent()) {
- if(cg.isPersistentForever())
- server.forceStorePersistentRequests();
- }
cg.start();
}
}
@@ -279,12 +273,6 @@
return;
} else {
Logger.minor(this, "Starting "+cp);
- // Register before starting, because it may complete
immediately, and if it does,
- // we may end up with it not being removable because it
wasn't registered!
- if(cp.isPersistent()) {
- if(cp.isPersistentForever())
- server.forceStorePersistentRequests();
- }
cp.start();
}
}
@@ -330,12 +318,6 @@
cp.cancel();
return;
} else {
- // Register before starting, because it may complete
immediately, and if it does,
- // we may end up with it not being removable because it
wasn't registered!
- if(cp.isPersistent()) {
- if(cp.isPersistentForever())
- server.forceStorePersistentRequests();
- }
if(Logger.shouldLog(Logger.MINOR, this))
Logger.minor(this, "Starting "+cp);
cp.start();
Modified: branches/db4o/freenet/src/freenet/node/fcp/FCPServer.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/fcp/FCPServer.java 2008-06-16
16:58:30 UTC (rev 20372)
+++ branches/db4o/freenet/src/freenet/node/fcp/FCPServer.java 2008-06-16
17:01:12 UTC (rev 20373)
@@ -656,10 +656,6 @@
defaultFetchContext.ignoreStore,
QUEUE_MAX_RETRIES, QUEUE_MAX_RETRIES,
QUEUE_MAX_DATA_SIZE, returnType,
persistRebootOnly, id, Integer.MAX_VALUE,
RequestStarter.BULK_SPLITFILE_PRIORITY_CLASS, returnFilename,
returnTempFilename, this);
- // Register before starting, because it may complete
immediately, and if it does,
- // we may end up with it not being removable because it wasn't
registered!
- if(cg.isPersistentForever())
- forceStorePersistentRequests();
cg.start();
}
