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

[t...@freenetproject.org]

Author: toad
Date: 2006-07-05 20:57:51 +0000 (Wed, 05 Jul 2006)
New Revision: 9471

Modified:
   trunk/freenet/src/freenet/node/PeerManager.java
Log:
fix NPE?

Modified: trunk/freenet/src/freenet/node/PeerManager.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerManager.java     2006-07-05 17:20:23 UTC 
(rev 9470)
+++ trunk/freenet/src/freenet/node/PeerManager.java     2006-07-05 20:57:51 UTC 
(rev 9471)
@@ -383,7 +383,8 @@
      */
     public PeerNode closerPeer(PeerNode pn, HashSet routedTo, HashSet 
notIgnored, double loc, boolean ignoreSelf) {
        PeerNode best = _closerPeer(pn, routedTo, notIgnored, loc, ignoreSelf, 
false);
-       if (best != null && 
node.getToadletContainer().isAdvancedDarknetEnabled()) {
+       if (best != null && node.getToadletContainer() != null &&
+                       node.getToadletContainer().isAdvancedDarknetEnabled()) {
                PeerNode nbo = _closerPeer(pn, routedTo, notIgnored, loc, 
ignoreSelf, true);
                if(nbo != null) {
                        node.missRoutingDistance.report(distance(best, 
nbo.getLocation().getValue()));