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

[t...@freenetproject.org]

Author: toad
Date: 2008-02-12 15:35:27 +0000 (Tue, 12 Feb 2008)
New Revision: 17830

Modified:
   trunk/freenet/src/freenet/node/NodePinger.java
Log:
Include backed off peers in ping time, as discussed on mailing list.

Modified: trunk/freenet/src/freenet/node/NodePinger.java
===================================================================
--- trunk/freenet/src/freenet/node/NodePinger.java      2008-02-12 14:57:42 UTC 
(rev 17829)
+++ trunk/freenet/src/freenet/node/NodePinger.java      2008-02-12 15:35:27 UTC 
(rev 17830)
@@ -54,26 +54,12 @@

                double[] allPeers = new double[peers.length];

-               /** Not backed off peers' ping times */
-               double[] nbPeers = new double[peers.length];
-               
-               /** Number of not backed off peers */
-               int nbCount = 0;
-               
                for(int i=0;i<peers.length;i++) {
                        PeerNode peer = peers[i];
                        double pingTime = peer.averagePingTime();
-                       if(!peer.isRoutingBackedOff()) {
-                               nbPeers[nbCount++] = pingTime;
-                       }
                        allPeers[i] = pingTime;
                }

-               if(nbCount > 0) {
-                       Arrays.sort(nbPeers, 0, nbCount);
-                       return nbPeers[nbCount / 2]; // round down - prefer 
lower
-               }
-               
                Arrays.sort(allPeers);
                return allPeers[peers.length / 2];
        }