Author: toad
Date: 2009-04-01 18:07:02 +0000 (Wed, 01 Apr 2009)
New Revision: 26316
Modified:
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java
Log:
indent
Modified:
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java
===================================================================
---
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java
2009-04-01 14:59:33 UTC (rev 26315)
+++
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java
2009-04-01 18:07:02 UTC (rev 26316)
@@ -493,32 +493,32 @@
* they reactivate deactivated data in their commit
hooks and thus
* cause serious problems. */
if(!req.persistent()) {
- List recent = schedTransient.recentSuccesses;
- SendableRequest altReq = null;
- if(!recent.isEmpty()) {
- if(random.nextBoolean()) {
- altReq = (BaseSendableGet)
recent.remove(recent.size()-1);
+ List recent = schedTransient.recentSuccesses;
+ SendableRequest altReq = null;
+ if(!recent.isEmpty()) {
+ if(random.nextBoolean()) {
+ altReq = (BaseSendableGet)
recent.remove(recent.size()-1);
+ }
}
+ if(altReq != null &&
(altReq.isCancelled(container) || altReq.isEmpty(container))) {
+ if(logMINOR)
+ Logger.minor(this, "Ignoring
cancelled recently succeeded item "+altReq);
+ altReq = null;
+ }
+ if(altReq != null &&
altReq.getPriorityClass(container) <= choosenPriorityClass &&
+
fixRetryCount(altReq.getRetryCount()) <= chosenTracker.getNumber() &&
!altReq.isEmpty(container) && altReq != req) {
+ // Use the recent one instead
+ if(logMINOR)
+ Logger.minor(this, "Recently
succeeded req "+altReq+" is better, using that, reregistering chosen "+req);
+ schedTransient.innerRegister(req,
random, null, null);
+ req = altReq;
+ } else if(altReq != null) {
+ // Don't use the recent one
+ if(logMINOR)
+ Logger.minor(this, "Chosen req
"+req+" is better, reregistering recently succeeded "+altReq);
+ recent.add(altReq);
+ }
}
- if(altReq != null && (altReq.isCancelled(container) ||
altReq.isEmpty(container))) {
- if(logMINOR)
- Logger.minor(this, "Ignoring cancelled
recently succeeded item "+altReq);
- altReq = null;
- }
- if(altReq != null && altReq.getPriorityClass(container)
<= choosenPriorityClass &&
- fixRetryCount(altReq.getRetryCount())
<= chosenTracker.getNumber() && !altReq.isEmpty(container) && altReq != req) {
- // Use the recent one instead
- if(logMINOR)
- Logger.minor(this, "Recently succeeded
req "+altReq+" is better, using that, reregistering chosen "+req);
- schedTransient.innerRegister(req, random, null,
null);
- req = altReq;
- } else if(altReq != null) {
- // Don't use the recent one
- if(logMINOR)
- Logger.minor(this, "Chosen req "+req+"
is better, reregistering recently succeeded "+altReq);
- recent.add(altReq);
- }
- }
// Now we have chosen a request.
if(logMINOR) Logger.minor(this, "removeFirst()
returning "+req+" ("+chosenTracker.getNumber()+", prio "+
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
