Author: toad
Date: 2009-04-02 23:41:17 +0000 (Thu, 02 Apr 2009)
New Revision: 26394
Modified:
trunk/freenet/src/freenet/client/async/ClientRequestScheduler.java
trunk/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java
Log:
This code path is always transient, simplify
Modified: trunk/freenet/src/freenet/client/async/ClientRequestScheduler.java
===================================================================
--- trunk/freenet/src/freenet/client/async/ClientRequestScheduler.java
2009-04-02 23:36:26 UTC (rev 26393)
+++ trunk/freenet/src/freenet/client/async/ClientRequestScheduler.java
2009-04-02 23:41:17 UTC (rev 26394)
@@ -463,7 +463,7 @@
fuzz = -1;
else if(PRIORITY_HARD.equals(choosenPriorityScheduler))
fuzz = 0;
- return schedCore.removeFirst(fuzz, random, offeredKeys,
starter, schedTransient, true, false, prio, retryCount, clientContext, null);
+ return schedCore.removeFirstTransient(fuzz, random,
offeredKeys, starter, schedTransient, prio, retryCount, clientContext, null);
}
/**
Modified: trunk/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java
===================================================================
--- trunk/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java
2009-04-02 23:36:26 UTC (rev 26393)
+++ trunk/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java
2009-04-02 23:41:17 UTC (rev 26394)
@@ -300,8 +300,8 @@
// We prevent a number of race conditions (e.g. adding a retry count
and then another
// thread removes it cos its empty) ... and in addToGrabArray etc we
already sync on this.
// The worry is ... is there any nested locking outside of the
hierarchy?
- ChosenBlock removeFirst(int fuzz, RandomSource random,
OfferedKeysList[] offeredKeys, RequestStarter starter,
ClientRequestSchedulerNonPersistent schedTransient, boolean transientOnly,
boolean notTransient, short maxPrio, int retryCount, ClientContext context,
ObjectContainer container) {
- SendableRequest req = removeFirstInner(fuzz, random,
offeredKeys, starter, schedTransient, transientOnly, notTransient, maxPrio,
retryCount, context, container);
+ ChosenBlock removeFirstTransient(int fuzz, RandomSource random,
OfferedKeysList[] offeredKeys, RequestStarter starter,
ClientRequestSchedulerNonPersistent schedTransient, short maxPrio, int
retryCount, ClientContext context, ObjectContainer container) {
+ SendableRequest req = removeFirstInner(fuzz, random,
offeredKeys, starter, schedTransient, true, false, maxPrio, retryCount,
context, container);
if(isInsertScheduler && req instanceof SendableGet) {
IllegalStateException e = new
IllegalStateException("removeFirstInner returned a SendableGet on an insert
scheduler!!");
req.internalError(e, sched, container, context,
req.persistent());
@@ -341,8 +341,6 @@
if(req instanceof SendableGet) {
SendableGet sg = (SendableGet) req;
FetchContext ctx = sg.getContext();
- if(container != null)
- container.activate(ctx, 1);
localRequestOnly = ctx.localRequestOnly;
cacheLocalRequests = ctx.cacheLocalRequests;
ignoreStore = ctx.ignoreStore;
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
