Author: toad
Date: 2008-10-08 17:44:14 +0000 (Wed, 08 Oct 2008)
New Revision: 22966
Modified:
branches/db4o/freenet/src/freenet/node/PeerNode.java
Log:
Merge 22870 from trunk: fix NPE
Modified: branches/db4o/freenet/src/freenet/node/PeerNode.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/PeerNode.java 2008-10-08
08:40:14 UTC (rev 22965)
+++ branches/db4o/freenet/src/freenet/node/PeerNode.java 2008-10-08
17:44:14 UTC (rev 22966)
@@ -74,6 +74,7 @@
import freenet.support.math.TimeDecayingRunningAverage;
import freenet.support.transport.ip.HostnameSyntaxException;
import freenet.support.transport.ip.IPUtil;
+import java.net.InetAddress;
/**
* @author amphibian
@@ -3912,7 +3913,9 @@
public static boolean shouldThrottle(Peer peer, Node node) {
if(node.throttleLocalData) return true;
if(peer == null) return true; // presumably
- return IPUtil.isValidAddress(peer.getAddress(), false);
+ InetAddress addr = peer.getAddress();
+ if(addr == null) return true; // presumably
+ return IPUtil.isValidAddress(addr, false);
}
public void reportPing(long t) {
