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

[t...@freenetproject.org]

Author: toad
Date: 2008-04-19 22:32:12 +0000 (Sat, 19 Apr 2008)
New Revision: 19450

Modified:
   trunk/freenet/src/freenet/support/transport/ip/IPAddressDetector.java
Log:
Definitely fix infinite recursion. Don't redetect just because lastAddressList 
is null. We rely on the lastDetectedTime mechanism to prevent infinite 
recursion.

Modified: trunk/freenet/src/freenet/support/transport/ip/IPAddressDetector.java
===================================================================
--- trunk/freenet/src/freenet/support/transport/ip/IPAddressDetector.java       
2008-04-19 22:31:01 UTC (rev 19449)
+++ trunk/freenet/src/freenet/support/transport/ip/IPAddressDetector.java       
2008-04-19 22:32:12 UTC (rev 19450)
@@ -58,8 +58,7 @@
         * @return Detected ip address
         */
        public InetAddress[] getAddress(long recheckTime) {
-               if(System.currentTimeMillis() > (lastDetectedTime + recheckTime)
-                               || lastAddressList == null)
+               if(System.currentTimeMillis() > (lastDetectedTime + 
recheckTime))
                        checkpoint();
                return lastAddressList == null ? new InetAddress[0] : 
lastAddressList;
        }