Author: toad
Date: 2009-02-25 18:32:07 +0000 (Wed, 25 Feb 2009)
New Revision: 25818
Modified:
branches/db4o/freenet/src/freenet/client/async/ClientRequestScheduler.java
Log:
Simplify slightly
Modified:
branches/db4o/freenet/src/freenet/client/async/ClientRequestScheduler.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/ClientRequestScheduler.java
2009-02-25 18:28:08 UTC (rev 25817)
+++ branches/db4o/freenet/src/freenet/client/async/ClientRequestScheduler.java
2009-02-25 18:32:07 UTC (rev 25818)
@@ -736,10 +736,10 @@
synchronized(ClientRequestScheduler.this) {
// Don't wake up for a while, but no
later than the time we expect the next item to come off the cooldown queue
if(!added) {
- if(noLaterThan !=
Long.MAX_VALUE)
-
nextQueueFillRequestStarterQueue = Math.min(System.currentTimeMillis() +
WAIT_AFTER_NOTHING_TO_START, noLaterThan + 1);
- else
-
nextQueueFillRequestStarterQueue = System.currentTimeMillis() +
WAIT_AFTER_NOTHING_TO_START;
+
nextQueueFillRequestStarterQueue =
+
System.currentTimeMillis() + WAIT_AFTER_NOTHING_TO_START;
+
if(nextQueueFillRequestStarterQueue > noLaterThan)
+
nextQueueFillRequestStarterQueue = noLaterThan + 1;
}
}
if(addedMore) starter.wakeUp();
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
