From 0b293c517f1ae725361dfd4c7199fd5fdfa3c51e Mon Sep 17 00:00:00 2001 From: zzz Date: Mon, 17 Oct 2011 17:22:23 +0000 Subject: [PATCH] * NetDB: Fix rare NPE from netdb.jsp (ticket #539) --- .../kademlia/KademliaNetworkDatabaseFacade.java | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java b/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java index a46ad3d33..c1a769dc9 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java @@ -928,24 +928,19 @@ public class KademliaNetworkDatabaseFacade extends NetworkDatabaseFacade { public Set getLeases() { if (!_initialized) return null; Set leases = new HashSet(); - Set keys = getDataStore().getKeys(); - for (Iterator iter = keys.iterator(); iter.hasNext(); ) { - Hash key = (Hash)iter.next(); - DatabaseEntry o = getDataStore().get(key); + for (DatabaseEntry o : getDataStore().getEntries()) { if (o.getType() == DatabaseEntry.KEY_TYPE_LEASESET) leases.add(o); } return leases; } + /** public for NetDbRenderer in routerconsole */ @Override public Set getRouters() { if (!_initialized) return null; Set routers = new HashSet(); - Set keys = getDataStore().getKeys(); - for (Iterator iter = keys.iterator(); iter.hasNext(); ) { - Hash key = (Hash)iter.next(); - DatabaseEntry o = getDataStore().get(key); + for (DatabaseEntry o : getDataStore().getEntries()) { if (o.getType() == DatabaseEntry.KEY_TYPE_ROUTERINFO) routers.add(o); }