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

[t...@freenetproject.org]

Author: toad
Date: 2008-03-24 16:01:00 +0000 (Mon, 24 Mar 2008)
New Revision: 18734

Modified:
   trunk/freenet/src/freenet/node/PeerNode.java
Log:
Make it conditional on cur tracker working.

Modified: trunk/freenet/src/freenet/node/PeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerNode.java        2008-03-24 15:58:49 UTC 
(rev 18733)
+++ trunk/freenet/src/freenet/node/PeerNode.java        2008-03-24 16:01:00 UTC 
(rev 18734)
@@ -2410,6 +2410,7 @@
                                        Logger.error(this, "Impossible: " + e, 
e);
                                }
                        if(t > -1 && now - tracker.timeLastDecodedPacket() > 
60*1000 && cur != null && 
+                                       (now - cur.timeLastDecodedPacket() < 
30*1000) && 
                                        (tracker.countAckRequests() > 0 || 
tracker.countResendRequests() > 0)) {
                                Logger.error(this, "No packets decoded on 
"+tracker+" for 60 seconds, deprecating in favour of cur: "+cur);
                                prev.completelyDeprecated(cur);