[freenet-cvs] r11857 - trunk/freenet/src/freenet/client/async

[t...@freenetproject.org]

Author: toad
Date: 2007-02-20 18:58:11 +0000 (Tue, 20 Feb 2007)
New Revision: 11857

Modified:
   trunk/freenet/src/freenet/client/async/ClientRequestScheduler.java
Log:
Paranoia

Modified: trunk/freenet/src/freenet/client/async/ClientRequestScheduler.java
===================================================================
--- trunk/freenet/src/freenet/client/async/ClientRequestScheduler.java  
2007-02-20 18:40:39 UTC (rev 11856)
+++ trunk/freenet/src/freenet/client/async/ClientRequestScheduler.java  
2007-02-20 18:58:11 UTC (rev 11857)
@@ -314,10 +314,14 @@
                                ClientRequester cr = req.getClientRequest();
                                if(req.canRemove()) {
                                        HashSet v = (HashSet) 
allRequestsByClientRequest.get(cr);
-                                       v.remove(req);
-                                       if(v.isEmpty())
-                                               
allRequestsByClientRequest.remove(cr);
-                                       if(logMINOR) Logger.minor(this, 
"Removed from "+v);
+                                       if(v == null) {
+                                               Logger.error(this, "No HashSet 
registered for "+cr);
+                                       } else {
+                                               v.remove(req);
+                                               if(v.isEmpty())
+                                                       
allRequestsByClientRequest.remove(cr);
+                                               if(logMINOR) Logger.minor(this, 
"Removed from "+v);
+                                       }
                                }
                                if(logMINOR) Logger.minor(this, "removeFirst() 
returning "+req);
                                return req;