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

[t...@freenetproject.org]

Author: toad
Date: 2008-07-16 22:39:17 +0000 (Wed, 16 Jul 2008)
New Revision: 21155

Modified:
   branches/db4o/freenet/src/freenet/client/async/ClientRequestScheduler.java
Log:
Fix another activation NPE

Modified: 
branches/db4o/freenet/src/freenet/client/async/ClientRequestScheduler.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/ClientRequestScheduler.java  
2008-07-16 22:29:09 UTC (rev 21154)
+++ branches/db4o/freenet/src/freenet/client/async/ClientRequestScheduler.java  
2008-07-16 22:39:17 UTC (rev 21155)
@@ -611,7 +611,9 @@
                        schedCore.removePendingKey(getter, complain, key, 
container);
                        if(persistentCooldownQueue != null) {
                                SendableGet cooldownGetter = 
getter.getRequest(key, container);
+                               container.activate(cooldownGetter, 1);
                                persistentCooldownQueue.removeKey(key, 
cooldownGetter, cooldownGetter.getCooldownWakeupByKey(key, container), 
container);
+                               container.deactivate(cooldownGetter, 1);
                        }
                } else {
                        jobRunner.queue(new DBJob() {
@@ -621,7 +623,9 @@
                                        schedCore.removePendingKey(getter, 
complain, key, container);
                                        if(persistentCooldownQueue != null) {
                                                SendableGet cooldownGetter = 
getter.getRequest(key, container);
+                                               
container.activate(cooldownGetter, 1);
                                                
persistentCooldownQueue.removeKey(key, cooldownGetter, 
cooldownGetter.getCooldownWakeupByKey(key, container), container);
+                                               
container.deactivate(cooldownGetter, 1);
                                        }
                                }