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

[nextg...@freenetproject.org]

Author: nextgens
Date: 2006-09-06 16:45:33 +0000 (Wed, 06 Sep 2006)
New Revision: 10411

Modified:
   trunk/freenet/src/freenet/node/PeerNode.java
   trunk/freenet/src/freenet/node/Version.java
Log:
971:
        commit toad's patch back (r10409)

Modified: trunk/freenet/src/freenet/node/PeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerNode.java        2006-09-06 16:35:03 UTC 
(rev 10410)
+++ trunk/freenet/src/freenet/node/PeerNode.java        2006-09-06 16:45:33 UTC 
(rev 10411)
@@ -2003,12 +2003,13 @@
                        localRoutingBackedOffUntil = routingBackedOffUntil;
                }
                synchronized(this) {
-                       if(now > lastSampleTime) {
-                               if (now > localRoutingBackedOffUntil) {
-                                       if (lastSampleTime > 
localRoutingBackedOffUntil) {
+                       if(now > lastSampleTime) { // don't report twice in the 
same millisecond
+                               if (now > localRoutingBackedOffUntil) { // not 
backed off
+                                       if (lastSampleTime > 
localRoutingBackedOffUntil) { // last sample after last backoff
                                                backedOffPercent.report(0.0);
                                        } else {
-                                               
backedOffPercent.report((double)(localRoutingBackedOffUntil - 
lastSampleTime)/(double)(now - lastSampleTime));
+                                               if(localRoutingBackedOffUntil > 
0)
+                                                       
backedOffPercent.report((double)(localRoutingBackedOffUntil - 
lastSampleTime)/(double)(now - lastSampleTime));
                                        }
                                } else {
                                        backedOffPercent.report(1.0);

Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2006-09-06 16:35:03 UTC (rev 
10410)
+++ trunk/freenet/src/freenet/node/Version.java 2006-09-06 16:45:33 UTC (rev 
10411)
@@ -21,7 +21,7 @@
        public static final String protocolVersion = "1.0";

        /** The build number of the current revision */
-       private static final int buildNumber = 970;
+       private static final int buildNumber = 971;

        /** Oldest build of Fred we will talk to */
        private static final int oldLastGoodBuild = 950;