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

[t...@freenetproject.org]

Author: toad
Date: 2008-03-04 17:35:27 +0000 (Tue, 04 Mar 2008)
New Revision: 18356

Modified:
   trunk/freenet/src/freenet/node/RequestHandler.java
Log:
Move getProbableQueueTime() outside the lock.

Modified: trunk/freenet/src/freenet/node/RequestHandler.java
===================================================================
--- trunk/freenet/src/freenet/node/RequestHandler.java  2008-03-04 17:34:30 UTC 
(rev 18355)
+++ trunk/freenet/src/freenet/node/RequestHandler.java  2008-03-04 17:35:27 UTC 
(rev 18356)
@@ -145,11 +145,12 @@
             sendTerminal(dnf);
             return;
         } else {
+               long queueTime = source.getProbableSendQueueTime();
             synchronized(this) {
                rs = (RequestSender) o;
                 //If we cannot respond before this time, the 'source' node has 
already fatally timed out (and we need not return packets which will not be 
claimed)
                        searchStartTime = System.currentTimeMillis();
-                       responseDeadline = searchStartTime + 
RequestSender.FETCH_TIMEOUT + source.getProbableSendQueueTime();
+                       responseDeadline = searchStartTime + 
RequestSender.FETCH_TIMEOUT + queueTime;
             }
             rs.addListener(this);
         }