Author: toad
Date: 2009-02-03 17:28:24 +0000 (Tue, 03 Feb 2009)
New Revision: 25496
Modified:
branches/db4o/freenet/src/freenet/client/async/ClientRequestScheduler.java
branches/db4o/freenet/src/freenet/node/RequestScheduler.java
branches/db4o/freenet/src/freenet/node/RequestStarter.java
Log:
Clarify, rename isRunningOrQueuedRequest -> isRunningOrQueuedPersistentRequest
Modified:
branches/db4o/freenet/src/freenet/client/async/ClientRequestScheduler.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/ClientRequestScheduler.java
2009-02-03 17:18:27 UTC (rev 25495)
+++ branches/db4o/freenet/src/freenet/client/async/ClientRequestScheduler.java
2009-02-03 17:28:24 UTC (rev 25496)
@@ -484,7 +484,7 @@
}
}
- public boolean isRunningOrQueuedRequest(SendableRequest request) {
+ public boolean isRunningOrQueuedPersistentRequest(SendableRequest
request) {
synchronized(starterQueue) {
for(int i=0;i<runningPersistentRequests.size();i++) {
if(runningPersistentRequests.get(i) == request)
Modified: branches/db4o/freenet/src/freenet/node/RequestScheduler.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/RequestScheduler.java
2009-02-03 17:18:27 UTC (rev 25495)
+++ branches/db4o/freenet/src/freenet/node/RequestScheduler.java
2009-02-03 17:28:24 UTC (rev 25496)
@@ -69,7 +69,11 @@
public void removeRunningRequest(SendableRequest request);
- public abstract boolean isRunningOrQueuedRequest(SendableRequest
request);
+ /**
+ * This only works for persistent requests, because transient requests
are not
+ * selected on a SendableRequest level, they are selected on a
{SendableRequest, token} level.
+ */
+ public abstract boolean
isRunningOrQueuedPersistentRequest(SendableRequest request);
public boolean hasFetchingKey(Key key);
Modified: branches/db4o/freenet/src/freenet/node/RequestStarter.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/RequestStarter.java 2009-02-03
17:18:27 UTC (rev 25495)
+++ branches/db4o/freenet/src/freenet/node/RequestStarter.java 2009-02-03
17:28:24 UTC (rev 25496)
@@ -242,7 +242,7 @@
}
public boolean exclude(RandomGrabArrayItem item, ObjectContainer
container, ClientContext context) {
- if(sched.isRunningOrQueuedRequest((SendableRequest)item)) {
+
if(sched.isRunningOrQueuedPersistentRequest((SendableRequest)item)) {
Logger.normal(this, "Excluding already-running request:
"+item, new Exception("debug"));
return true;
}
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
