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

[toad at freenetproject.org]

Author: toad
Date: 2007-06-08 18:07:35 +0000 (Fri, 08 Jun 2007)
New Revision: 13493

Modified:
   trunk/freenet/src/freenet/node/NodeDispatcher.java
   trunk/freenet/src/freenet/node/PeerManager.java
Log:
Logging (mostly)

Modified: trunk/freenet/src/freenet/node/NodeDispatcher.java
===================================================================
--- trunk/freenet/src/freenet/node/NodeDispatcher.java	2007-06-08 17:44:41 UTC (rev 13492)
+++ trunk/freenet/src/freenet/node/NodeDispatcher.java	2007-06-08 18:07:35 UTC (rev 13493)
@@ -641,6 +641,9 @@
 			newBestLocs.addAll(locsNotVisited);
 			PeerNode pn = node.peers.closerPeer(src, visited, null, target, true, false, 965, newBestLocs);
 			
+			if(logMINOR)
+				Logger.minor(this, "newBestLocs (unsorted): "+newBestLocs);
+			
 			Double[] locs = (Double[]) newBestLocs.toArray(new Double[newBestLocs.size()]);
 			Arrays.sort(locs, new Comparator() {
 				public int compare(Object arg0, Object arg1) {
@@ -657,6 +660,9 @@
 			for(int i=0;i<Math.min(MAX_LOCS_NOT_VISITED, locs.length);i++)
 				locsNotVisited.add(locs[i]);
 			
+			if(logMINOR)
+				Logger.minor(this, "newBestLocs: "+locsNotVisited);
+			
 			Message sub = DMT.createFNPBestRoutesNotTaken((Double[])locsNotVisited.toArray(new Double[locsNotVisited.size()]));
 			
 			ctx.notVisitedList = locsNotVisited;

Modified: trunk/freenet/src/freenet/node/PeerManager.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerManager.java	2007-06-08 17:44:41 UTC (rev 13492)
+++ trunk/freenet/src/freenet/node/PeerManager.java	2007-06-08 18:07:35 UTC (rev 13493)
@@ -614,6 +614,7 @@
             	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);
             	}
@@ -623,7 +624,7 @@
                 if(logMINOR) Logger.minor(this, "New best: "+diff+" ("+p.getLocation().getValue()+" for "+p.getPeer());
             }
         }
-        if(addUnpickedLocsTo != null)
+        if(addUnpickedLocsTo != null && bestLoc > 0)
         	addUnpickedLocsTo.remove(new Double(bestLoc));
         return best;
     }