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

[t...@freenetproject.org]

Author: toad
Date: 2007-07-17 17:30:56 +0000 (Tue, 17 Jul 2007)
New Revision: 14167

Modified:
   trunk/freenet/src/freenet/node/NodeDispatcher.java
Log:
delete obsolete FIXME

Modified: trunk/freenet/src/freenet/node/NodeDispatcher.java
===================================================================
--- trunk/freenet/src/freenet/node/NodeDispatcher.java  2007-07-17 17:23:29 UTC 
(rev 14166)
+++ trunk/freenet/src/freenet/node/NodeDispatcher.java  2007-07-17 17:30:56 UTC 
(rev 14167)
@@ -437,7 +437,7 @@

        class ProbeContext {

-               private final WeakReference /* <PeerNode> */ srcRef; // FIXME 
make this a weak reference or something ? - Memory leak with high connection 
churn
+               private final WeakReference /* <PeerNode> */ srcRef;
                final WeakHashSet visitedPeers;
                final ProbeCallback cb;
                short counter;
@@ -840,6 +840,7 @@

                // Maybe fork

+               try {
                double furthestDist = 0.0;
                if(notVisitedList.size() > 0) {
                        if(ctx.forkCount < MAX_FORKS) {
@@ -871,6 +872,10 @@
                                        return true;
                        }
                }
+               } catch (Throwable t) {
+                       // If something happens during the fork attempt, just 
propagate it
+                       Logger.error(this, "Caught "+t+" while trying to fork", 
t);
+               }

                // Just propagate back to source
                PeerNode origSource = (PeerNode) ctx.getSource();