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

[t...@freenetproject.org]

Author: toad
Date: 2008-07-01 15:09:17 +0000 (Tue, 01 Jul 2008)
New Revision: 20913

Modified:
   
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java
Log:
Ignore cancelled altReq's.
Logging.

Modified: 
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java
===================================================================
--- 
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java  
    2008-07-01 14:53:50 UTC (rev 20912)
+++ 
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java  
    2008-07-01 15:09:17 UTC (rev 20913)
@@ -407,6 +407,10 @@
                        }
                        if(altReq != null)
                                container.activate(altReq, 1);
+                       if(altReq != null && altReq.isCancelled(container)) {
+                               if(logMINOR)
+                                       Logger.minor(this, "Ignoring cancelled 
recently succeeded item "+altReq);
+                       }
                        if(altReq != null && altReq.getPriorityClass(container) 
<= choosenPriorityClass && 
                                        fixRetryCount(altReq.getRetryCount()) 
<= chosenTracker.getNumber() && !altReq.isEmpty(container)) {
                                // Use the recent one instead
@@ -550,6 +554,8 @@
                }
                RegisterMe reg = new RegisterMe(req, 
req.getPriorityClass(container), this);
                container.set(reg);
+               if(logMINOR)
+                       Logger.minor(this, "Queued RegisterMe for "+req+" : 
"+reg);
                return reg;
        }