Author: toad
Date: 2008-12-09 23:58:12 +0000 (Tue, 09 Dec 2008)
New Revision: 24159
Modified:
trunk/freenet/
trunk/freenet/src/freenet/node/PacketSender.java
Log:
Re-apply 24155: IMHO this could cause *gross* unfairness in some cases, likely
resulting in horrible bugs.
Property changes on: trunk/freenet
___________________________________________________________________
Added: svn:mergeinfo
+ /trunk/freenet:24155
Modified: trunk/freenet/src/freenet/node/PacketSender.java
===================================================================
--- trunk/freenet/src/freenet/node/PacketSender.java 2008-12-09 23:56:08 UTC
(rev 24158)
+++ trunk/freenet/src/freenet/node/PacketSender.java 2008-12-09 23:58:12 UTC
(rev 24159)
@@ -229,7 +229,8 @@
int newBrokeAt = 0;
for(int i = 0; i < nodes.length; i++) {
- PeerNode pn = nodes[(i + brokeAt + 1) % nodes.length];
+ int idx = (i + brokeAt + 1) % nodes.length;
+ PeerNode pn = nodes[idx];
lastReceivedPacketFromAnyNode =
Math.max(pn.lastReceivedPacketTime(),
lastReceivedPacketFromAnyNode);
pn.maybeOnConnect();
@@ -271,7 +272,7 @@
if(logMINOR)
Logger.minor(this, "Can
send throttled packets in "+canSendAt+"ms");
nextActionTime =
Math.min(nextActionTime, now + canSendAt);
- newBrokeAt = i;
+ newBrokeAt = idx;
}
}
} catch (BlockedTooLongException e) {
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
