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

[t...@freenetproject.org]

Author: toad
Date: 2007-12-08 18:30:23 +0000 (Sat, 08 Dec 2007)
New Revision: 16416

Modified:
   trunk/freenet/src/freenet/node/PeerNode.java
Log:
Similar refactoring

Modified: trunk/freenet/src/freenet/node/PeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerNode.java        2007-12-08 18:25:42 UTC 
(rev 16415)
+++ trunk/freenet/src/freenet/node/PeerNode.java        2007-12-08 18:30:23 UTC 
(rev 16416)
@@ -1220,16 +1220,18 @@
                                fetchARKFlag = true;
                        }
                }
+               long delay;
                if(listeningHandshakeBurstCount == 0) {  // 0 only if we just 
reset it above
-                       sendHandshakeTime = now + 
Node.MIN_TIME_BETWEEN_BURSTING_HANDSHAKE_BURSTS
+                       delay = Node.MIN_TIME_BETWEEN_BURSTING_HANDSHAKE_BURSTS
                                + 
node.random.nextInt(Node.RANDOMIZED_TIME_BETWEEN_BURSTING_HANDSHAKE_BURSTS);
                        listeningHandshakeBurstSize = 
Node.MIN_BURSTING_HANDSHAKE_BURST_SIZE
                                        + 
node.random.nextInt(Node.RANDOMIZED_BURSTING_HANDSHAKE_BURST_SIZE);
                        isBursting = false;
                } else {
-                       sendHandshakeTime = now + 
Node.MIN_TIME_BETWEEN_HANDSHAKE_SENDS
+                       delay = Node.MIN_TIME_BETWEEN_HANDSHAKE_SENDS
                                + 
node.random.nextInt(Node.RANDOMIZED_TIME_BETWEEN_HANDSHAKE_SENDS);
                }
+               sendHandshakeTime = now + delay;
                if(logMINOR) Logger.minor(this, "Next BurstOnly mode handshake 
in "+(sendHandshakeTime - now)+"ms for "+shortToString()+" (count: 
"+listeningHandshakeBurstCount+", size: "+listeningHandshakeBurstSize+ ')', new 
Exception("double-called debug"));
                return fetchARKFlag;
        }