[freenet-cvs] r22236 - branches/db4o/freenet/src/freenet/client/async

[t...@freenetproject.org]

Author: toad
Date: 2008-08-29 23:11:08 +0000 (Fri, 29 Aug 2008)
New Revision: 22236

Modified:
   branches/db4o/freenet/src/freenet/client/async/ClientRequestScheduler.java
Log:
Don't check for deactivation here.


Modified: 
branches/db4o/freenet/src/freenet/client/async/ClientRequestScheduler.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/ClientRequestScheduler.java  
2008-08-29 23:08:35 UTC (rev 22235)
+++ branches/db4o/freenet/src/freenet/client/async/ClientRequestScheduler.java  
2008-08-29 23:11:08 UTC (rev 22236)
@@ -895,8 +895,8 @@
                        }
                        if(reqs != null) {
                                for(int i=0;i<reqs.length;i++) {
-                                       if(container.ext().isActive(reqs[i]))
-                                               Logger.error(this, "ALREADY 
ACTIVE in moveKeysFromCooldownQueue: "+reqs[i]);
+                                       // Requests may or may not be returned 
activated from requestsForKey(), so don't check
+                                       // But do deactivate them once we're 
done with them.
                                        container.activate(reqs[i], 1);
                                        reqs[i].requeueAfterCooldown(key, now, 
container, clientContext);
                                        container.deactivate(reqs[i], 1);