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

[t...@freenetproject.org]

Author: toad
Date: 2008-02-02 15:55:37 +0000 (Sat, 02 Feb 2008)
New Revision: 17469

Modified:
   trunk/freenet/src/freenet/node/FailureTableEntry.java
Log:
&& makes more sense - no point setting a timeout if there isn't a timeout to set

Modified: trunk/freenet/src/freenet/node/FailureTableEntry.java
===================================================================
--- trunk/freenet/src/freenet/node/FailureTableEntry.java       2008-02-02 
15:31:37 UTC (rev 17468)
+++ trunk/freenet/src/freenet/node/FailureTableEntry.java       2008-02-02 
15:55:37 UTC (rev 17469)
@@ -69,7 +69,7 @@
        public void onFailure(short htl2, PeerNode[] requestors, PeerNode 
requested, int timeout, long now) {
                synchronized(this) {
                        long newTimeoutTime = now + timeout;
-                       if(now > timeoutTime /* has expired */ || 
newTimeoutTime > timeoutTime) {
+                       if(now > timeoutTime /* has expired */ && 
newTimeoutTime > timeoutTime) {
                                htl = htl2;
                                timeoutTime = newTimeoutTime;
                        }