Author: toad
Date: 2008-05-23 17:09:25 +0000 (Fri, 23 May 2008)
New Revision: 20076
Modified:
branches/db4o/freenet/src/freenet/client/async/ClientRequestScheduler.java
Log:
removePendingKey(): Don't need to remove from both, the SendableGet knows
whether it is persistent().
Modified:
branches/db4o/freenet/src/freenet/client/async/ClientRequestScheduler.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/ClientRequestScheduler.java
2008-05-23 17:05:15 UTC (rev 20075)
+++ branches/db4o/freenet/src/freenet/client/async/ClientRequestScheduler.java
2008-05-23 17:09:25 UTC (rev 20076)
@@ -242,6 +242,7 @@
}
public void removePendingKey(final SendableGet getter, final boolean
complain, final Key key) {
+ if(getter.persistent()) {
boolean dropped = schedTransient.removePendingKey(getter,
complain, key);
if(dropped && offeredKeys != null && !node.peersWantKey(key)) {
for(int i=0;i<offeredKeys.length;i++)
@@ -249,7 +250,7 @@
}
if(transientCooldownQueue != null)
transientCooldownQueue.removeKey(key, getter,
getter.getCooldownWakeupByKey(key), null);
-
+ } else {
// Now the persistent clients...
databaseExecutor.execute(new Runnable() {
@@ -264,7 +265,7 @@
}
}, "removePendingKey");
-
+ }
}
/**
