Author: toad
Date: 2009-04-06 22:34:07 +0000 (Mon, 06 Apr 2009)
New Revision: 26578
Modified:
trunk/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java
Log:
indent
Modified: trunk/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java
===================================================================
--- trunk/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java
2009-04-06 22:33:31 UTC (rev 26577)
+++ trunk/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java
2009-04-06 22:34:07 UTC (rev 26578)
@@ -533,27 +533,27 @@
if(altRGA != null) {
container.activate(altRGA, 1);
if(container.ext().isStored(altRGA) && !altRGA.isEmpty()) {
- if(logMINOR)
- Logger.minor(this,
"Maybe using recently succeeded item from "+altRGA);
- SendableRequest altReq =
(SendableRequest) altRGA.removeRandom(starter, container, context);
- if(altReq != null) {
-
container.activate(altReq, 1);
- int prio =
altReq.getPriorityClass(container);
- if((prio <
choosenPriorityClass || (prio == choosenPriorityClass &&
fixRetryCount(altReq.getRetryCount()) <= chosenTracker.getNumber()))
-
&& !altReq.isEmpty(container) && altReq != req) {
- // Use the
recent one instead
- if(logMINOR)
-
Logger.minor(this, "Recently succeeded (persistent) req "+altReq+"
(prio="+altReq.getPriorityClass(container)+" retry count
"+altReq.getRetryCount()+") is better than "+req+"
(prio="+req.getPriorityClass(container)+" retry "+req.getRetryCount()+"), using
that");
- // Don't need
to reregister, because removeRandom doesn't actually remove!
- req = altReq;
- } else if(altReq !=
null) {
- if(logMINOR)
-
Logger.minor(this, "Chosen (persistent) req "+req+" is better, reregistering
recently succeeded "+altRGA+" for "+altReq);
-
synchronized(recentSuccesses) {
-
recentSuccesses.add(altRGA);
+ if(logMINOR)
+
Logger.minor(this, "Maybe using recently succeeded item from "+altRGA);
+ SendableRequest altReq
= (SendableRequest) altRGA.removeRandom(starter, container, context);
+ if(altReq != null) {
+
container.activate(altReq, 1);
+ int prio =
altReq.getPriorityClass(container);
+ if((prio <
choosenPriorityClass || (prio == choosenPriorityClass &&
fixRetryCount(altReq.getRetryCount()) <= chosenTracker.getNumber()))
+
&& !altReq.isEmpty(container) && altReq != req) {
+ // Use
the recent one instead
+
if(logMINOR)
+
Logger.minor(this, "Recently succeeded (persistent) req "+altReq+"
(prio="+altReq.getPriorityClass(container)+" retry count
"+altReq.getRetryCount()+") is better than "+req+"
(prio="+req.getPriorityClass(container)+" retry "+req.getRetryCount()+"), using
that");
+ //
Don't need to reregister, because removeRandom doesn't actually remove!
+ req =
altReq;
+ } else
if(altReq != null) {
+
if(logMINOR)
+
Logger.minor(this, "Chosen (persistent) req "+req+" is better, reregistering
recently succeeded "+altRGA+" for "+altReq);
+
synchronized(recentSuccesses) {
+
recentSuccesses.add(altRGA);
+ }
}
}
- }
} else {
container.deactivate(altRGA, 1);
}
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
