Author: toad
Date: 2008-11-14 17:44:15 +0000 (Fri, 14 Nov 2008)
New Revision: 23583
Modified:
trunk/freenet/src/freenet/node/KeyTracker.java
trunk/freenet/src/freenet/node/Version.java
Log:
doh - actually wake PacketSender
Modified: trunk/freenet/src/freenet/node/KeyTracker.java
===================================================================
--- trunk/freenet/src/freenet/node/KeyTracker.java 2008-11-14 17:30:54 UTC
(rev 23582)
+++ trunk/freenet/src/freenet/node/KeyTracker.java 2008-11-14 17:44:15 UTC
(rev 23583)
@@ -741,10 +741,11 @@
}
return true;
} else {
- long delta = now - timeWouldBlock;
- timeWouldBlock = -1;
- if(timeWouldBlock != -1 && (delta >
PacketSender.MAX_COALESCING_DELAY)) {
- Logger.error(this, "Waking
PacketSender: have been blocking for packet ack for
"+TimeUtil.formatTime(delta));
+ if(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));
+ } else return false;
} else return false;
}
}
Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2008-11-14 17:30:54 UTC (rev
23582)
+++ trunk/freenet/src/freenet/node/Version.java 2008-11-14 17:44:15 UTC (rev
23583)
@@ -24,11 +24,11 @@
public static final String protocolVersion = "1.0";
/** The build number of the current revision */
- private static final int buildNumber = 1175;
+ private static final int buildNumber = 1176;
/** Oldest build of Fred we will talk to */
- private static final int oldLastGoodBuild = 1174;
- private static final int newLastGoodBuild = 1175;
+ private static final int oldLastGoodBuild = 1175;
+ private static final int newLastGoodBuild = 1176;
static final long transitionTime;
static {
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
