[freenet-cvs] r19449 - trunk/freenet/src/freenet/support/transport/ip

[t...@freenetproject.org]

Author: toad
Date: 2008-04-19 22:31:01 +0000 (Sat, 19 Apr 2008)
New Revision: 19449

Modified:
   trunk/freenet/src/freenet/support/transport/ip/IPAddressDetector.java
Log:
Maybe fix infinite recursion.

Modified: trunk/freenet/src/freenet/support/transport/ip/IPAddressDetector.java
===================================================================
--- trunk/freenet/src/freenet/support/transport/ip/IPAddressDetector.java       
2008-04-19 19:51:26 UTC (rev 19448)
+++ trunk/freenet/src/freenet/support/transport/ip/IPAddressDetector.java       
2008-04-19 22:31:01 UTC (rev 19449)
@@ -122,8 +122,8 @@
                InetAddress[] oldAddressList = lastAddressList;
                onGetAddresses(addrs);
                lastDetectedTime = System.currentTimeMillis();
-               if(oldAddressList == lastAddressList || oldAddressList == null 
&& lastAddressList != null ||
-                               oldAddressList != null && lastAddressList != 
null && !Arrays.equals(oldAddressList, lastAddressList)) {
+               if(oldAddressList != lastAddressList && (oldAddressList == null 
&& lastAddressList != null ||
+                               oldAddressList != null && lastAddressList != 
null && !Arrays.equals(oldAddressList, lastAddressList))) {
                        // Something changed.
                        // Yes I know it could just have changed the order, but 
this is unlikely hopefully. FIXME.
                        detector.redetectAddress();