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

[t...@freenetproject.org]

Author: toad
Date: 2007-06-08 18:09:48 +0000 (Fri, 08 Jun 2007)
New Revision: 13495

Modified:
   trunk/freenet/src/freenet/node/PeerManager.java
Log:
Fix no best-locs-not-visited-so-far on first probe trace

Modified: trunk/freenet/src/freenet/node/PeerManager.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerManager.java     2007-06-08 18:08:15 UTC 
(rev 13494)
+++ trunk/freenet/src/freenet/node/PeerManager.java     2007-06-08 18:09:48 UTC 
(rev 13495)
@@ -611,20 +611,21 @@
                continue;
             }
             if(diff < bestDiff) {
-               if(bestLoc > 0 && addUnpickedLocsTo != null) {
+               double loc = p.getLocation().getValue();
+               if(bestLoc >= 0 && addUnpickedLocsTo != null) {
                        Double d = new Double(bestLoc);
                        // Here we can directly compare double's because they 
aren't processed in any way, and are finite and (probably) nonzero.
                        if(logMINOR) Logger.minor(this, "Adding: "+bestLoc);
                        if(!addUnpickedLocsTo.contains(d))
                                addUnpickedLocsTo.add(d);
                }
-               bestLoc = target;
+               bestLoc = loc;
                 best = p;
                 bestDiff = diff;
                 if(logMINOR) Logger.minor(this, "New best: "+diff+" 
("+p.getLocation().getValue()+" for "+p.getPeer());
             }
         }
-        if(addUnpickedLocsTo != null && bestLoc > 0)
+        if(addUnpickedLocsTo != null && bestLoc >= 0)
                addUnpickedLocsTo.remove(new Double(bestLoc));
         return best;
     }