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

[toad at freenetproject.org]

Author: toad
Date: 2008-04-03 12:49:58 +0000 (Thu, 03 Apr 2008)
New Revision: 18951

Modified:
   trunk/freenet/src/freenet/support/transport/ip/IPAddressDetector.java
Log:
Check for nulls before doing comparison

Modified: trunk/freenet/src/freenet/support/transport/ip/IPAddressDetector.java
===================================================================
--- trunk/freenet/src/freenet/support/transport/ip/IPAddressDetector.java	2008-04-03 12:46:16 UTC (rev 18950)
+++ trunk/freenet/src/freenet/support/transport/ip/IPAddressDetector.java	2008-04-03 12:49:58 UTC (rev 18951)
@@ -123,7 +123,7 @@
 		onGetAddresses(addrs);
 		lastDetectedTime = System.currentTimeMillis();
 		if(oldAddressList == lastAddressList || oldAddressList == null && lastAddressList != null ||
-				!Arrays.equals(oldAddressList, lastAddressList)) {
+				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();