[freenet-cvs] r18837 - trunk/freenet/src/freenet/client/async

[t...@freenetproject.org]

Author: toad
Date: 2008-03-29 16:40:28 +0000 (Sat, 29 Mar 2008)
New Revision: 18837

Modified:
   trunk/freenet/src/freenet/client/async/ClientRequestScheduler.java
Log:
Trivial optimisation

Modified: trunk/freenet/src/freenet/client/async/ClientRequestScheduler.java
===================================================================
--- trunk/freenet/src/freenet/client/async/ClientRequestScheduler.java  
2008-03-29 16:38:37 UTC (rev 18836)
+++ trunk/freenet/src/freenet/client/async/ClientRequestScheduler.java  
2008-03-29 16:40:28 UTC (rev 18837)
@@ -538,18 +538,18 @@
                                        if(gets[j] == null || 
gets[j].isCancelled()) continue;
                                        newGets[x++] = gets[j];
                                }
+                               if(x == 0) {
+                                       pendingKeys.remove(key);
+                                       dropped = true;
+                               } else if(x == 1) {
+                                       pendingKeys.put(key, newGets[0]);
+                               } else {
                                if(x != gets.length-1) {
                                        SendableGet[] newNewGets = new 
SendableGet[x];
                                        System.arraycopy(newGets, 0, 
newNewGets, 0, x);
                                        newGets = newNewGets;
                                }
-                               if(newGets.length == 0) {
-                                       pendingKeys.remove(key);
-                                       dropped = true;
-                               } else if(newGets.length == 1) {
-                                       pendingKeys.put(key, newGets[0]);
-                               } else {
-                                       pendingKeys.put(key, newGets);
+                               pendingKeys.put(key, newGets);
                                }
                        }
                }