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

[t...@freenetproject.org]

Author: toad
Date: 2008-01-14 16:46:46 +0000 (Mon, 14 Jan 2008)
New Revision: 17038

Modified:
   trunk/freenet/src/freenet/node/NodeIPDetector.java
Log:
overrideIPAddress may be null, compare as IP addresses so more accurately.

Modified: trunk/freenet/src/freenet/node/NodeIPDetector.java
===================================================================
--- trunk/freenet/src/freenet/node/NodeIPDetector.java  2008-01-14 16:14:16 UTC 
(rev 17037)
+++ trunk/freenet/src/freenet/node/NodeIPDetector.java  2008-01-14 16:46:46 UTC 
(rev 17038)
@@ -343,7 +343,8 @@
                                } catch (UnknownHostException e) {
                                        throw new 
InvalidConfigValueException(l10n("unknownHostErrorInIPOverride", "error", 
e.getMessage()));
                                }
-                               if(val.equals(overrideIPAddress.toString())) 
return;
+                               // Compare as IPs.
+                               if(addr.equals(overrideIPAddress)) return;
                                overrideIPAddress = addr;
                                lastIPAddress = null;
                                redetectAddress();