Author: toad
Date: 2008-05-22 18:32:38 +0000 (Thu, 22 May 2008)
New Revision: 20044
Modified:
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java
Log:
Doh: Set cooldown time and container even if we read the queue object in from
the db.
Modified:
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java
===================================================================
---
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java
2008-05-22 18:30:05 UTC (rev 20043)
+++
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java
2008-05-22 18:32:38 UTC (rev 20044)
@@ -61,7 +61,7 @@
core = new ClientRequestSchedulerCore(node, forInserts,
forSSKs, selectorContainer, cooldownTime);
}
logMINOR = Logger.shouldLog(Logger.MINOR,
ClientRequestSchedulerCore.class);
- core.onStarted(selectorContainer);
+ core.onStarted(selectorContainer, cooldownTime);
return core;
}
@@ -71,18 +71,20 @@
this.container = selectorContainer;
if(!forInserts) {
this.persistentCooldownQueue = new
PersistentCooldownQueue();
- persistentCooldownQueue.setContainer(container);
- persistentCooldownQueue.setCooldownTime(cooldownTime);
} else {
this.persistentCooldownQueue = null;
}
}
- private void onStarted(ObjectContainer container) {
+ private void onStarted(ObjectContainer container, long cooldownTime) {
((Db4oMap)pendingKeys).activationDepth(1);
((Db4oMap)allRequestsByClientRequest).activationDepth(1);
((Db4oList)recentSuccesses).activationDepth(1);
this.container = container;
+ if(!isInsertScheduler) {
+ persistentCooldownQueue.setContainer(container);
+ persistentCooldownQueue.setCooldownTime(cooldownTime);
+ }
}
// We pass in the schedTransient to the next two methods so that we can
select between either of them.
