[freenet-cvs] r16054 - trunk/freenet/src/freenet/node

[t...@freenetproject.org]

Author: toad
Date: 2007-11-29 00:36:59 +0000 (Thu, 29 Nov 2007)
New Revision: 16054

Modified:
   trunk/freenet/src/freenet/node/RequestStarter.java
Log:
Fix NPE and fix premature exit

Modified: trunk/freenet/src/freenet/node/RequestStarter.java
===================================================================
--- trunk/freenet/src/freenet/node/RequestStarter.java  2007-11-29 00:33:11 UTC 
(rev 16053)
+++ trunk/freenet/src/freenet/node/RequestStarter.java  2007-11-29 00:36:59 UTC 
(rev 16054)
@@ -123,7 +123,7 @@
                                } else {
                                        stats.waitUntilNotOverloaded(isInsert);
                                }
-                               return;
+                               continue;
                        } else {
                                if(logMINOR) Logger.minor(this, "Waiting...");  
                        
                                // Always take the lock on RequestStarter 
first. AFAICS we don't synchronize on RequestStarter anywhere else.
@@ -139,6 +139,7 @@
                                        }
                                }
                        }
+                       if(req == null) continue;
                        startRequest(req, logMINOR);
                        sentRequestTime = System.currentTimeMillis();
                }