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

[nextg...@freenetproject.org]

Author: nextgens
Date: 2008-07-29 23:16:32 +0000 (Tue, 29 Jul 2008)
New Revision: 21499

Modified:
   trunk/freenet/src/freenet/node/PeerManager.java
Log:
comment

Modified: trunk/freenet/src/freenet/node/PeerManager.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerManager.java     2008-07-29 23:14:43 UTC 
(rev 21498)
+++ trunk/freenet/src/freenet/node/PeerManager.java     2008-07-29 23:16:32 UTC 
(rev 21499)
@@ -958,7 +958,7 @@

                PeerNode best = closestNotBackedOff;

-               if(best == null)
+               if(best == null) {
                        if(leastRecentlyTimedOut != null) {
                                // FIXME downgrade to DEBUG
                                best = leastRecentlyTimedOut;
@@ -973,9 +973,11 @@
                                if(logMINOR)
                                        Logger.minor(this, "Using least 
recently failed in-timeout-period backed-off peer for key: " + 
best.shortToString() + " for " + key);
                        }
+               }

-               //racy... getLocation() could have changed
+               // DO NOT PUT A ELSE HERE: we need to re-check the value!
                if(best != null) {
+                       //racy... getLocation() could have changed
                        if(calculateMisrouting) {
                                
node.nodeStats.routingMissDistance.report(Location.distance(best, 
closest.getLocation()));
                                int numberOfConnected = 
getPeerNodeStatusSize(PEER_NODE_STATUS_CONNECTED, false);