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

[t...@freenetproject.org]

Author: toad
Date: 2008-07-22 15:58:15 +0000 (Tue, 22 Jul 2008)
New Revision: 21312

Modified:
   
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java
Log:
Activation/deactivation

Modified: 
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java
===================================================================
--- 
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java  
    2008-07-22 15:54:45 UTC (rev 21311)
+++ 
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java  
    2008-07-22 15:58:15 UTC (rev 21312)
@@ -331,6 +331,9 @@
                                container.set(ret);
                                if(logMINOR)
                                        Logger.minor(this, "Storing "+ret+" for 
"+req);
+                               container.deactivate(key, 5);
+                               container.deactivate(ckey, 5);
+                               container.deactivate(req.getClientRequest(), 1);
                        } else {
                                if(key != null && key.getRoutingKey() == null)
                                        throw new NullPointerException();
@@ -658,7 +661,13 @@
                                                        
reg.getters[k].internalError(null, t, sched, container, context, true);
                                        }
                                }
+                               if(reg.listener != null)
+                                       container.deactivate(reg.listener, 1);
+                               if(reg.getters != null) {
+                                       for(int j=0;j<reg.getters.length;j++)
+                                               
container.deactivate(reg.getters[j], 1);
                                }
+                               }
                                if(reg.nonGetRequest != null) {
                                        container.activate(reg.nonGetRequest, 
1);
                                        
if(reg.nonGetRequest.isCancelled(container)) {
@@ -669,7 +678,9 @@
                                                
sched.registerInsert(reg.nonGetRequest, true, false);
                                        }
                                        container.delete(reg);
+                                       container.deactivate(reg.nonGetRequest, 
1);
                                }
+                               container.deactivate(reg, 1);
                                if(System.currentTimeMillis() > deadline) break;
                        }
                        boolean boost = sched.isQueueAlmostEmpty();