Author: toad
Date: 2008-10-27 21:07:42 +0000 (Mon, 27 Oct 2008)
New Revision: 23115
Modified:
trunk/freenet/src/freenet/io/AddressTracker.java
Log:
Merge the other NPE fix, this time on startup.
Modified: trunk/freenet/src/freenet/io/AddressTracker.java
===================================================================
--- trunk/freenet/src/freenet/io/AddressTracker.java 2008-10-27 21:03:46 UTC
(rev 23114)
+++ trunk/freenet/src/freenet/io/AddressTracker.java 2008-10-27 21:07:42 UTC
(rev 23115)
@@ -105,7 +105,8 @@
timeDefinitelyNoPacketsReceived = System.currentTimeMillis();
timeDefinitelyNoPacketsSent =
fs.getLong("TimeDefinitelyNoPacketsSent");
peerTrackers = new HashMap();
- SimpleFieldSet peers = fs.getSubset("Peers");
+ SimpleFieldSet peers = fs.subset("Peers");
+ if(peers != null) {
Iterator i = peers.directSubsetNameIterator();
if(i != null) {
while(i.hasNext()) {
@@ -114,9 +115,11 @@
peerTrackers.put(item.peer, item);
}
}
+ }
ipTrackers = new HashMap();
- SimpleFieldSet ips = fs.getSubset("IPs");
- i = ips.directSubsetNameIterator();
+ SimpleFieldSet ips = fs.subset("IPs");
+ if(ips != null) {
+ Iterator i = ips.directSubsetNameIterator();
if(i != null) {
while(i.hasNext()) {
SimpleFieldSet peer = ips.subset((String)i.next());
@@ -124,6 +127,7 @@
ipTrackers.put(item.addr, item);
}
}
+ }
}
public void sentPacketTo(Peer peer) {
