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

[t...@freenetproject.org]

Author: toad
Date: 2007-06-22 14:53:17 +0000 (Fri, 22 Jun 2007)
New Revision: 13706

Modified:
   trunk/freenet/src/freenet/node/PeerManager.java
Log:
Simplify: add all, remove best.

Modified: trunk/freenet/src/freenet/node/PeerManager.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerManager.java     2007-06-22 14:52:09 UTC 
(rev 13705)
+++ trunk/freenet/src/freenet/node/PeerManager.java     2007-06-22 14:53:17 UTC 
(rev 13706)
@@ -635,24 +635,17 @@
             }
             double loc = p.getLocation().getValue();
             if(diff < bestDiff) {
-               if(best != null) {
-                       Double d = new Double(bestLoc);
-                       if(!addUnpickedLocsTo.contains(d))
-                               addUnpickedLocsTo.add(d);
-               }
                bestLoc = loc;
                 best = p;
                 bestDiff = diff;
                 if(logMINOR) Logger.minor(this, "New best: "+diff+" 
("+p.getLocation().getValue()+" for "+p.getPeer());
-            } else {
-               if(addUnpickedLocsTo != null) {
-                       Double d = new Double(loc);
-                       // Here we can directly compare double's because they 
aren't processed in any way, and are finite and (probably) nonzero.
-                       if(!addUnpickedLocsTo.contains(d))
-                               addUnpickedLocsTo.add(d);
-                       
-               }
             }
+               if(addUnpickedLocsTo != null) {
+                       Double d = new Double(loc);
+                       // Here we can directly compare double's because they 
aren't processed in any way, and are finite and (probably) nonzero.
+                       if(!addUnpickedLocsTo.contains(d))
+                               addUnpickedLocsTo.add(d);
+               }
         }
         if(addUnpickedLocsTo != null && bestLoc >= 0)
                addUnpickedLocsTo.remove(new Double(bestLoc));