Author: toad
Date: 2008-12-17 14:24:45 +0000 (Wed, 17 Dec 2008)
New Revision: 24432
Modified:
branches/db4o/freenet/src/freenet/node/PacketSender.java
branches/db4o/freenet/src/freenet/node/Version.java
Log:
Merge 1192 (changed files)
Modified: branches/db4o/freenet/src/freenet/node/PacketSender.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/PacketSender.java 2008-12-17
14:22:22 UTC (rev 24431)
+++ branches/db4o/freenet/src/freenet/node/PacketSender.java 2008-12-17
14:24:45 UTC (rev 24432)
@@ -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) {
Modified: branches/db4o/freenet/src/freenet/node/Version.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/Version.java 2008-12-17 14:22:22 UTC
(rev 24431)
+++ branches/db4o/freenet/src/freenet/node/Version.java 2008-12-17 14:24:45 UTC
(rev 24432)
@@ -24,17 +24,17 @@
public static final String protocolVersion = "1.0";
/** The build number of the current revision */
- private static final int buildNumber = 1191;
+ private static final int buildNumber = 1192;
/** Oldest build of Fred we will talk to */
- private static final int oldLastGoodBuild = 1188;
- private static final int newLastGoodBuild = 1190;
+ private static final int oldLastGoodBuild = 1190;
+ private static final int newLastGoodBuild = 1192;
static final long transitionTime;
static {
final Calendar _cal =
Calendar.getInstance(TimeZone.getTimeZone("GMT"));
// year, month - 1 (or constant), day, hour, minute, second
- _cal.set( 2008, Calendar.DECEMBER, 9, 0, 0, 0 );
+ _cal.set( 2008, Calendar.DECEMBER, 12, 0, 0, 0 );
transitionTime = _cal.getTimeInMillis();
}
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
