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

[t...@freenetproject.org]

Author: toad
Date: 2008-08-27 16:02:35 +0000 (Wed, 27 Aug 2008)
New Revision: 22185

Modified:
   
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java
Log:
makeKeyListener() can return null. Don't add to the global list if it does.


Modified: 
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java
===================================================================
--- 
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java  
    2008-08-27 09:37:00 UTC (rev 22184)
+++ 
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java  
    2008-08-27 16:02:35 UTC (rev 22185)
@@ -210,7 +210,9 @@
                for(HasKeyListener l : results) {
                        try {
                                if(l.isCancelled(container)) continue;
-                               addPendingKeys(l.makeKeyListener(container, 
context));
+                               KeyListener listener = 
l.makeKeyListener(container, context);
+                               if(listener != null)
+                                       addPendingKeys(listener);
                        } catch (KeyListenerConstructionException e) {
                                System.err.println("FAILED TO LOAD REQUEST 
BLOOM FILTERS:");
                                e.printStackTrace();