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

[t...@freenetproject.org]

Author: toad
Date: 2007-06-28 13:58:30 +0000 (Thu, 28 Jun 2007)
New Revision: 13804

Modified:
   trunk/freenet/src/freenet/node/FailureTableEntry.java
Log:
Prevent NPE later on

Modified: trunk/freenet/src/freenet/node/FailureTableEntry.java
===================================================================
--- trunk/freenet/src/freenet/node/FailureTableEntry.java       2007-06-28 
13:57:14 UTC (rev 13803)
+++ trunk/freenet/src/freenet/node/FailureTableEntry.java       2007-06-28 
13:58:30 UTC (rev 13804)
@@ -122,7 +122,7 @@
                        // Nice special case
                        int x = 0;
                        for(int i=0;i<requestorNodes.length;i++) {
-                               if(requestorNodes[i].get() == null) {
+                               if(requestorNodes[i] == null || 
requestorNodes[i].get() == null) {
                                        PeerNode pn = requestors[x++];
                                        requestorNodes[i] = pn.myRef;
                                        requestorTimes[i] = now;
@@ -217,7 +217,7 @@
                        // Nice special case
                        int x = 0;
                        for(int i=0;i<requestedNodes.length;i++) {
-                               if(requestedNodes[i].get() == null) {
+                               if(requestedNodes[i] == null || 
requestedNodes[i].get() == null) {
                                        PeerNode pn = requestedFrom[x++];
                                        requestedNodes[i] = pn.myRef;
                                        requestedLocs[i] = 
pn.getLocation().getValue();