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

[nextg...@freenetproject.org]

Author: nextgens
Date: 2007-03-28 15:35:15 +0000 (Wed, 28 Mar 2007)
New Revision: 12411

Modified:
   trunk/freenet/src/freenet/node/RequestSender.java
Log:
Sync. fix

Modified: trunk/freenet/src/freenet/node/RequestSender.java
===================================================================
--- trunk/freenet/src/freenet/node/RequestSender.java   2007-03-28 12:29:21 UTC 
(rev 12410)
+++ trunk/freenet/src/freenet/node/RequestSender.java   2007-03-28 15:35:15 UTC 
(rev 12411)
@@ -541,9 +541,10 @@
                }

                private void _realRun() {
-                       short current = mask; // If any bits are set already, 
we ignore those states.
-               
+                       short current;
                        synchronized (cb) {
+                               current = mask; // If any bits are set already, 
we ignore those states.
+                               
                                if(hasForwardedRejectedOverload)
                                        current |= WAIT_REJECTED_OVERLOAD;

@@ -552,13 +553,11 @@

                        if(status != NOT_FINISHED)
                                current |= WAIT_FINISHED;
-       
-                               }
-                       
-               if(current != mask)
-                       cb.onStatusChange(current);
-               else
-                       node.ps.queueTimedJob(this, 10000);
+
+                       if(current == mask)
+                               node.ps.queueTimedJob(this, 10000);
+                       }
+               cb.onStatusChange(current);
                }
        };