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

[t...@freenetproject.org]

Author: toad
Date: 2008-03-25 13:15:41 +0000 (Tue, 25 Mar 2008)
New Revision: 18772

Modified:
   trunk/freenet/src/freenet/support/RandomGrabArray.java
Log:
Slightly better recovery from a null (which shouldn't happen).
Cleaner, and set the right element to null!

Modified: trunk/freenet/src/freenet/support/RandomGrabArray.java
===================================================================
--- trunk/freenet/src/freenet/support/RandomGrabArray.java      2008-03-25 
13:03:13 UTC (rev 18771)
+++ trunk/freenet/src/freenet/support/RandomGrabArray.java      2008-03-25 
13:15:41 UTC (rev 18772)
@@ -140,11 +140,11 @@
                                ret = reqs[i];
                                if(ret == null) {
                                        Logger.error(this, "reqs["+i+"] = 
null");
-                                       if(i != index-1) {
-                                               reqs[i] = reqs[index-1];
+                                       index--;
+                                       if(i != index) {
+                                               reqs[i] = reqs[index];
                                                reqs[index] = null;
                                        }
-                                       index--;
                                        continue;
                                }
                                oret = ret;