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

[mrog...@freenetproject.org]

Author: mrogers
Date: 2006-05-31 10:28:29 +0000 (Wed, 31 May 2006)
New Revision: 8949

Modified:
   trunk/freenet/src/freenet/node/Node.java
Log:
Fixed 3 typos relating to RejectedOverloads - should lead to smoother backoff


Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java    2006-05-30 04:26:51 UTC (rev 
8948)
+++ trunk/freenet/src/freenet/node/Node.java    2006-05-31 10:28:29 UTC (rev 
8949)
@@ -1965,15 +1965,16 @@
        }
        if(pingTime > SUB_MAX_PING_TIME) {
                double x = (pingTime - SUB_MAX_PING_TIME) / (MAX_PING_TIME - 
SUB_MAX_PING_TIME);
-               if(random.nextDouble() < x)
+               if(random.nextDouble() < x) {
                        Logger.minor( this, "shouldRejectRequest() == true 
because >SUB_MAX_PING_TIME");
                        return true;
+               }
        }

        // Bandwidth limited packets

        double bwlimitDelayTime = 
this.throttledPacketSendAverage.currentValue();
-       if(pingTime > MAX_THROTTLE_DELAY) {
+       if(bwlimitDelayTime > MAX_THROTTLE_DELAY) {
                if(now - lastAcceptedRequest > MAX_INTERREQUEST_TIME) {
                        lastAcceptedRequest = now;
                        return false;
@@ -1983,9 +1984,10 @@
        }
        if(bwlimitDelayTime > SUB_MAX_THROTTLE_DELAY) {
                double x = (pingTime - SUB_MAX_THROTTLE_DELAY) / 
(MAX_THROTTLE_DELAY - SUB_MAX_THROTTLE_DELAY);
-               if(random.nextDouble() < x)
+               if(random.nextDouble() < x) {
                        Logger.minor( this, "shouldRejectRequest() == true 
because >SUB_MAX_THROTTLE_DELAY");
                        return true;
+               }
        }

        lastAcceptedRequest = now;