[freenet-cvs] r11814 - trunk/freenet/src/freenet/support

[t...@freenetproject.org]

Author: toad
Date: 2007-02-16 15:17:55 +0000 (Fri, 16 Feb 2007)
New Revision: 11814

Modified:
   trunk/freenet/src/freenet/support/RandomGrabArray.java
Log:
Doh

Modified: trunk/freenet/src/freenet/support/RandomGrabArray.java
===================================================================
--- trunk/freenet/src/freenet/support/RandomGrabArray.java      2007-02-16 
15:08:43 UTC (rev 11813)
+++ trunk/freenet/src/freenet/support/RandomGrabArray.java      2007-02-16 
15:17:55 UTC (rev 11814)
@@ -50,7 +50,7 @@
                        if(index == 0) return null;
                        int i = rand.nextInt(index);
                        RandomGrabArrayItem ret = reqs[i];
-                       if(!ret.canRemove()) return ret;
+                       if(ret != null && !ret.canRemove()) return ret;
                        reqs[i] = reqs[--index];
                        reqs[index] = null;
                        if(ret != null)