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

[t...@freenetproject.org]

Author: toad
Date: 2008-08-01 12:51:06 +0000 (Fri, 01 Aug 2008)
New Revision: 21553

Modified:
   
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java
Log:
Check listeners as well as gets. Don't register if all killed.

Modified: 
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java
===================================================================
--- 
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java  
    2008-08-01 12:31:21 UTC (rev 21552)
+++ 
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java  
    2008-08-01 12:51:06 UTC (rev 21553)
@@ -647,9 +647,14 @@
                                                
if(!reg.getters[j].isCancelled(container))
                                                        allKilled = false;
                                        }
+                                       if(reg.listener != null) {
+                                               
if(!reg.listener.isCancelled(container))
+                                                       allKilled = false;
+                                       }
                                        if(allKilled) {
                                                if(logMINOR)
                                                        Logger.minor(this, "Not 
registering as all SendableGet's already cancelled");
+                                               continue;
                                        }
                                }