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

[t...@freenetproject.org]

Author: toad
Date: 2008-07-21 14:03:18 +0000 (Mon, 21 Jul 2008)
New Revision: 21285

Modified:
   
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java
Log:
Logging, essentially. Don't register if cancelled (check here rather than 
later), log whether we register it.

Modified: 
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java
===================================================================
--- 
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java  
    2008-07-21 14:01:32 UTC (rev 21284)
+++ 
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java  
    2008-07-21 14:03:18 UTC (rev 21285)
@@ -661,7 +661,13 @@
                                }
                                if(reg.nonGetRequest != null) {
                                        container.activate(reg.nonGetRequest, 
1);
-                                       sched.registerInsert(reg.nonGetRequest, 
true, false);
+                                       
if(reg.nonGetRequest.isCancelled(container)) {
+                                               Logger.normal(this, 
"RegisterMe: request cancelled: "+reg.nonGetRequest);
+                                       } else {
+                                               if(logMINOR)
+                                                       Logger.minor(this, 
"Registering RegisterMe for insert: "+reg.nonGetRequest);
+                                               
sched.registerInsert(reg.nonGetRequest, true, false);
+                                       }
                                        container.delete(reg);
                                }
                                if(System.currentTimeMillis() > deadline) break;