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

[t...@freenetproject.org]

Author: toad
Date: 2007-06-27 22:37:35 +0000 (Wed, 27 Jun 2007)
New Revision: 13786

Modified:
   trunk/freenet/src/freenet/node/NodeIPDetector.java
Log:
Avoid unlikely NPE

Modified: trunk/freenet/src/freenet/node/NodeIPDetector.java
===================================================================
--- trunk/freenet/src/freenet/node/NodeIPDetector.java  2007-06-27 22:32:32 UTC 
(rev 13785)
+++ trunk/freenet/src/freenet/node/NodeIPDetector.java  2007-06-27 22:37:35 UTC 
(rev 13786)
@@ -12,6 +12,7 @@
 import freenet.io.comm.FreenetInetAddress;
 import freenet.io.comm.Peer;
 import freenet.io.comm.MessageCore;
+import freenet.io.comm.UdpSocketHandler;
 import freenet.l10n.L10n;
 import freenet.node.useralerts.IPUndetectedUserAlert;
 import freenet.node.useralerts.SimpleUserAlert;
@@ -86,9 +87,9 @@
                                addedValidIP = true;
                }
                boolean dontDetect = false;
-               MessageCore usm = node.usm;
-               if(usm != null) {
-                       InetAddress addr = node.sock.getBindTo();
+               UdpSocketHandler sock = node.sock;
+               if(sock != null) {
+                       InetAddress addr = sock.getBindTo();
                        if(addr != null && (IPUtil.isValidAddress(addr, 
false))) {
                                dontDetect = true;
                                Peer p = new Peer(addr, node.portNumber);