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

[rob...@freenetproject.org]

Author: robert
Date: 2008-01-19 05:02:58 +0000 (Sat, 19 Jan 2008)
New Revision: 17164

Modified:
   trunk/freenet/src/freenet/node/Node.java
   trunk/freenet/src/freenet/node/RequestSender.java
Log:
fix fatal timeout


Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java    2008-01-19 03:33:18 UTC (rev 
17163)
+++ trunk/freenet/src/freenet/node/Node.java    2008-01-19 05:02:58 UTC (rev 
17164)
@@ -1779,7 +1779,7 @@
                        // Request coalescing
                        KeyHTLPair kh = new KeyHTLPair(key, htl);
                        sender = (RequestSender) requestSenders.get(kh);
-                       if(sender != null) {
+                       if(sender != null && !sender.isLocalRequestSearch()) {
                                if(logMINOR) Logger.minor(this, "Found sender: 
"+sender+" for "+uid);
                                return sender;
                        }

Modified: trunk/freenet/src/freenet/node/RequestSender.java
===================================================================
--- trunk/freenet/src/freenet/node/RequestSender.java   2008-01-19 03:33:18 UTC 
(rev 17163)
+++ trunk/freenet/src/freenet/node/RequestSender.java   2008-01-19 05:02:58 UTC 
(rev 17164)
@@ -851,4 +851,8 @@
        synchronized int getRecentlyFailedTimeLeft() {
                return recentlyFailedTimeLeft;
        }
+       
+       public boolean isLocalRequestSearch() {
+               return (source==null);
+       }
 }