[freenet-cvs] r16129 - trunk/freenet/src/freenet/node

[t...@freenetproject.org]

Author: toad
Date: 2007-11-30 14:31:18 +0000 (Fri, 30 Nov 2007)
New Revision: 16129

Modified:
   trunk/freenet/src/freenet/node/PeerNode.java
Log:
Fix the crazy-output-bandwidth-no-payload bug, hopefully.

Modified: trunk/freenet/src/freenet/node/PeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerNode.java        2007-11-30 14:14:29 UTC 
(rev 16128)
+++ trunk/freenet/src/freenet/node/PeerNode.java        2007-11-30 14:31:18 UTC 
(rev 16129)
@@ -1066,7 +1066,7 @@
                long now = System.currentTimeMillis();
                boolean tempShouldSendHandshake = false;
                synchronized(this) {
-                       tempShouldSendHandshake = ((!isConnected()) && 
(handshakeIPs != null) && (now > sendHandshakeTime)) || isRekeying;
+                       tempShouldSendHandshake = ((isRekeying || 
!isConnected()) && (handshakeIPs != null) && (now > sendHandshakeTime));
                }
                if(tempShouldSendHandshake && (hasLiveHandshake(now)))
                        tempShouldSendHandshake = false;