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

[t...@freenetproject.org]

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

Modified:
   trunk/freenet/src/freenet/node/PeerNode.java
Log:
More rigorous: only apply if we have had packets.

Modified: trunk/freenet/src/freenet/node/PeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerNode.java        2008-03-24 16:01:00 UTC 
(rev 18734)
+++ trunk/freenet/src/freenet/node/PeerNode.java        2008-03-24 16:03:00 UTC 
(rev 18735)
@@ -2409,8 +2409,8 @@
                                } catch(WouldBlockException e) {
                                        Logger.error(this, "Impossible: " + e, 
e);
                                }
-                       if(t > -1 && now - tracker.timeLastDecodedPacket() > 
60*1000 && cur != null && 
-                                       (now - cur.timeLastDecodedPacket() < 
30*1000) && 
+                       if(t > -1 && tracker.timeLastDecodedPacket() > 0 && 
(now - tracker.timeLastDecodedPacket()) > 60*1000 && 
+                                       cur != null && 
cur.timeLastDecodedPacket() > 0 && (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);