Author: toad
Date: 2008-10-27 21:03:46 +0000 (Mon, 27 Oct 2008)
New Revision: 23114
Modified:
trunk/freenet/src/freenet/node/PeerNode.java
Log:
Merge the NPE fix.
Modified: trunk/freenet/src/freenet/node/PeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerNode.java 2008-10-27 21:01:49 UTC
(rev 23113)
+++ trunk/freenet/src/freenet/node/PeerNode.java 2008-10-27 21:03:46 UTC
(rev 23114)
@@ -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) {
