Author: toad
Date: 2008-07-04 13:57:19 +0000 (Fri, 04 Jul 2008)
New Revision: 20991
Modified:
branches/db4o/freenet/src/freenet/client/async/ClientRequestScheduler.java
branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSegment.java
branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSubSegment.java
Log:
CRS.addPendingKey() doesn't in fact need it
Modified:
branches/db4o/freenet/src/freenet/client/async/ClientRequestScheduler.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/ClientRequestScheduler.java
2008-07-04 13:53:45 UTC (rev 20990)
+++ branches/db4o/freenet/src/freenet/client/async/ClientRequestScheduler.java
2008-07-04 13:57:19 UTC (rev 20991)
@@ -436,14 +436,14 @@
requestStarterQueueFiller.run(container, context);
}
- void addPendingKey(final ClientKey key, final SendableGet getter,
ObjectContainer container) {
+ void addPendingKey(final ClientKey key, final SendableGet getter) {
if(getter.persistent()) {
if(!databaseExecutor.onThread()) {
throw new IllegalStateException("Not on
database thread!");
}
- schedCore.addPendingKey(key, getter, container);
+ schedCore.addPendingKey(key, getter, selectorContainer);
} else
- schedTransient.addPendingKey(key, getter, container);
+ schedTransient.addPendingKey(key, getter, null);
}
private synchronized ChosenRequest removeFirst(ObjectContainer
container, boolean transientOnly, boolean notTransient) {
Modified:
branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSegment.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSegment.java
2008-07-04 13:53:45 UTC (rev 20990)
+++ branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSegment.java
2008-07-04 13:57:19 UTC (rev 20991)
@@ -567,7 +567,7 @@
}
if(cooldown) {
// Register to the next sub-segment before removing
from the old one.
- sub.getScheduler(context).addPendingKey(key, sub,
container);
+ sub.getScheduler(context).addPendingKey(key, sub);
seg.unregisterKey(key.getNodeKey(), context, container);
if(logMINOR)
Logger.minor(this, "Adding to cooldown queue:
"+key+" for "+this+" was on segment "+seg+" now registered to "+sub);
Modified:
branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSubSegment.java
===================================================================
---
branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSubSegment.java
2008-07-04 13:53:45 UTC (rev 20990)
+++
branches/db4o/freenet/src/freenet/client/async/SplitFileFetcherSubSegment.java
2008-07-04 13:57:19 UTC (rev 20991)
@@ -459,7 +459,7 @@
if(schedule) schedule(container, context, false, true); //
Retrying so not in store
else if(!dontSchedule)
// Already scheduled, however this key may not be
registered.
-
getScheduler(context).addPendingKey(segment.getBlockKey(blockNo, container),
this, container);
+
getScheduler(context).addPendingKey(segment.getBlockKey(blockNo, container),
this);
}
public String toString() {
