Author: toad
Date: 2008-03-25 13:03:13 +0000 (Tue, 25 Mar 2008)
New Revision: 18771
Modified:
trunk/freenet/src/freenet/node/PeerNode.java
Log:
Fix NPE and delete obsolete comment.
Modified: trunk/freenet/src/freenet/node/PeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerNode.java 2008-03-25 04:31:31 UTC
(rev 18770)
+++ trunk/freenet/src/freenet/node/PeerNode.java 2008-03-25 13:03:13 UTC
(rev 18771)
@@ -2420,10 +2420,10 @@
cur = currentTracker;
prev = previousTracker;
}
- long t = previousTracker.getNextUrgentTime(); // LOCKING:
should be safe, only inner structures
- if(!(t > -1 && previousTracker.timeLastDecodedPacket() > 0 &&
(now - previousTracker.timeLastDecodedPacket()) > 60*1000 &&
- currentTracker.timeLastDecodedPacket() > 0 &&
(now - currentTracker.timeLastDecodedPacket() < 30*1000) &&
- (previousTracker.countAckRequests() > 0 ||
previousTracker.countResendRequests() > 0)))
+ long t = prev.getNextUrgentTime();
+ if(!(t > -1 && prev.timeLastDecodedPacket() > 0 && (now -
prev.timeLastDecodedPacket()) > 60*1000 &&
+ cur.timeLastDecodedPacket() > 0 && (now -
cur.timeLastDecodedPacket() < 30*1000) &&
+ (prev.countAckRequests() > 0 ||
prev.countResendRequests() > 0)))
return;
Logger.error(this, "No packets decoded on "+prev+" for 60
seconds, deprecating in favour of cur: "+cur);
prev.completelyDeprecated(cur);
