Author: toad
Date: 2008-11-29 19:24:27 +0000 (Sat, 29 Nov 2008)
New Revision: 23982
Modified:
branches/db4o/freenet/
branches/db4o/freenet/src/freenet/node/KeyTracker.java
branches/db4o/freenet/src/freenet/node/Version.java
branches/db4o/freenet/src/freenet/support/BinaryBloomFilter.java
branches/db4o/freenet/src/freenet/support/BloomFilter.java
branches/db4o/freenet/src/freenet/support/CountingBloomFilter.java
branches/db4o/freenet/test/freenet/support/io/MockInputStream.java
Log:
Merge 1177
Property changes on: branches/db4o/freenet
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/freenet:19964-23583
+ /trunk/freenet:19964-23586
Modified: branches/db4o/freenet/src/freenet/node/KeyTracker.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/KeyTracker.java 2008-11-29
19:21:46 UTC (rev 23981)
+++ branches/db4o/freenet/src/freenet/node/KeyTracker.java 2008-11-29
19:24:27 UTC (rev 23982)
@@ -712,6 +712,9 @@
sentPacketsContents.lock(packetNumber);
if(logMINOR)
Logger.minor(this, "Locked
"+packetNumber);
+ synchronized(this) {
+ timeWouldBlock = -1;
+ }
return packetNumber;
} catch(InterruptedException e) {
synchronized(this) {
@@ -742,6 +745,7 @@
return true;
} else {
if(timeWouldBlock != -1) {
+ timeWouldBlock = -1;
long delta = now - timeWouldBlock;
if(delta >
PacketSender.MAX_COALESCING_DELAY) {
Logger.error(this, "Waking
PacketSender: have been blocking for packet ack for
"+TimeUtil.formatTime(delta));
Modified: branches/db4o/freenet/src/freenet/node/Version.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/Version.java 2008-11-29 19:21:46 UTC
(rev 23981)
+++ branches/db4o/freenet/src/freenet/node/Version.java 2008-11-29 19:24:27 UTC
(rev 23982)
@@ -24,17 +24,17 @@
public static final String protocolVersion = "1.0";
/** The build number of the current revision */
- private static final int buildNumber = 1176;
+ private static final int buildNumber = 1177;
/** Oldest build of Fred we will talk to */
private static final int oldLastGoodBuild = 1175;
- private static final int newLastGoodBuild = 1176;
+ private static final int newLastGoodBuild = 1177;
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.NOVEMBER, 15, 0, 0, 0 );
+ _cal.set( 2008, Calendar.NOVEMBER, 16, 0, 0, 0 );
transitionTime = _cal.getTimeInMillis();
}
Property changes on:
branches/db4o/freenet/src/freenet/support/BinaryBloomFilter.java
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/freenet/src/freenet/support/BinaryBloomFilter.java:22002-23583
+ /trunk/freenet/src/freenet/support/BinaryBloomFilter.java:22002-23586
Property changes on: branches/db4o/freenet/src/freenet/support/BloomFilter.java
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/freenet/src/freenet/support/BloomFilter.java:22002-23583
+ /trunk/freenet/src/freenet/support/BloomFilter.java:22002-23586
Property changes on:
branches/db4o/freenet/src/freenet/support/CountingBloomFilter.java
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/freenet/src/freenet/support/CountingBloomFilter.java:22002-23583
+ /trunk/freenet/src/freenet/support/CountingBloomFilter.java:22002-23586
Property changes on:
branches/db4o/freenet/test/freenet/support/io/MockInputStream.java
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/freenet/test/freenet/support/io/MockInputStream.java:22002-23583
+ /trunk/freenet/test/freenet/support/io/MockInputStream.java:22002-23586
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
