Author: toad
Date: 2007-04-14 20:07:48 +0000 (Sat, 14 Apr 2007)
New Revision: 12719
Modified:
trunk/freenet/src/freenet/node/CHKInsertSender.java
Log:
more dead code
Modified: trunk/freenet/src/freenet/node/CHKInsertSender.java
===================================================================
--- trunk/freenet/src/freenet/node/CHKInsertSender.java 2007-04-14 20:06:08 UTC
(rev 12718)
+++ trunk/freenet/src/freenet/node/CHKInsertSender.java 2007-04-14 20:07:48 UTC
(rev 12719)
@@ -650,6 +650,7 @@
waiters = new
AwaitingCompletion[nodesWaitingForCompletion.size()];
waiters = (AwaitingCompletion[])
nodesWaitingForCompletion.toArray(waiters);
}
+ // Because we have completed, no more waiters
will be added.
// First calculate the timeout
@@ -658,19 +659,12 @@
long now = System.currentTimeMillis();
- if(transfersCompletedTime == -1) {
- // Wait 5 seconds, then try again
- timeout = 5000;
- } else {
- // Completed, wait for everything
- timeout =
(int)Math.min(Integer.MAX_VALUE, (transfersCompletedTime +
TRANSFER_COMPLETION_ACK_TIMEOUT) - now);
- }
+ timeout = (int)Math.min(Integer.MAX_VALUE,
(transfersCompletedTime + TRANSFER_COMPLETION_ACK_TIMEOUT) - now);
if(timeout <= 0) {
noTimeLeft = true;
timeout = 1;
}
-
MessageFilter mf = null;
boolean waitingForAny = false;
boolean anyNotCompleted = false;
