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

[t...@freenetproject.org]

Author: toad
Date: 2007-03-21 22:23:30 +0000 (Wed, 21 Mar 2007)
New Revision: 12259

Modified:
   trunk/freenet/src/freenet/node/RequestStarter.java
Log:
AFAICS calling sched.removeFirst() within the RequestStarter lock is safe; we 
don't use it anywhere else.

Modified: trunk/freenet/src/freenet/node/RequestStarter.java
===================================================================
--- trunk/freenet/src/freenet/node/RequestStarter.java  2007-03-21 22:20:45 UTC 
(rev 12258)
+++ trunk/freenet/src/freenet/node/RequestStarter.java  2007-03-21 22:23:30 UTC 
(rev 12259)
@@ -126,14 +126,12 @@
                                return;
                        } else {
                                if(logMINOR) Logger.minor(this, "Waiting...");  
                        
-                               req = sched.removeFirst();
-                               if(req != null) {
-                                       continue;
-                               }
                                // Always take the lock on RequestStarter first.
                                synchronized(this) {
+                                       req = sched.removeFirst();
+                                       if(req != null) continue;
                                        try {
-                                               wait(1000);
+                                               wait(1000*1000);
                                        } catch (InterruptedException e) {
                                                // Ignore
                                        }