r26577 - trunk/freenet/src/freenet/client/async

Author: toad
Date: 2009-04-06 22:33:31 +0000 (Mon, 06 Apr 2009)
New Revision: 26577

Modified:
   trunk/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java
Log:
Don't check isEmpty until after activated


Modified: trunk/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java
===================================================================
--- trunk/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java	2009-04-06 22:28:12 UTC (rev 26576)
+++ trunk/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java	2009-04-06 22:33:31 UTC (rev 26577)
@@ -530,9 +530,9 @@
 							altRGA = recentSuccesses.remove(recentSuccesses.size()-1);
 						}
 					}
-					container.activate(altRGA, 1);
-					if(altRGA != null && container.ext().isStored(altRGA) && !altRGA.isEmpty()) {
+					if(altRGA != null) {
 						container.activate(altRGA, 1);
+						if(container.ext().isStored(altRGA) && !altRGA.isEmpty()) {
 						if(logMINOR)
 							Logger.minor(this, "Maybe using recently succeeded item from "+altRGA);
 						SendableRequest altReq = (SendableRequest) altRGA.removeRandom(starter, container, context);
@@ -554,6 +554,9 @@
 								}
 							}
 						}
+						} else {
+							container.deactivate(altRGA, 1);
+						}
 					}
 				}