[freenet-cvs] r15555 - trunk/freenet/src/freenet/node

[t...@freenetproject.org]

Author: toad
Date: 2007-10-25 15:32:54 +0000 (Thu, 25 Oct 2007)
New Revision: 15555

Modified:
   trunk/freenet/src/freenet/node/LocationManager.java
Log:
prevent NPE in any case

Modified: trunk/freenet/src/freenet/node/LocationManager.java
===================================================================
--- trunk/freenet/src/freenet/node/LocationManager.java 2007-10-25 15:31:56 UTC 
(rev 15554)
+++ trunk/freenet/src/freenet/node/LocationManager.java 2007-10-25 15:32:54 UTC 
(rev 15555)
@@ -1091,6 +1091,10 @@
             while(e.hasMoreElements()) {
                 Long l = (Long)e.nextElement();
                 RecentlyForwardedItem item = 
(RecentlyForwardedItem)recentlyForwardedIDs.get(l);
+                if(item == null) {
+                       Logger.error(this, "Key is "+l+" but no value on 
recentlyForwardedIDs - shouldn't be possible");
+                       continue;
+                }
                 if(item.routedTo != pn) continue;
                 if(item.successfullyForwarded) {
                     removeRecentlyForwardedItem(item);