Author: toad
Date: 2008-03-22 16:54:13 +0000 (Sat, 22 Mar 2008)
New Revision: 18722
Modified:
trunk/freenet/src/freenet/node/PeerNode.java
Log:
Logging
Modified: trunk/freenet/src/freenet/node/PeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerNode.java 2008-03-22 16:48:33 UTC
(rev 18721)
+++ trunk/freenet/src/freenet/node/PeerNode.java 2008-03-22 16:54:13 UTC
(rev 18722)
@@ -1905,8 +1905,9 @@
* greater than previous's.
*/
private synchronized void maybeSwapTrackers() {
+ long delta = Math.abs(currentTracker.createdTime -
previousTracker.createdTime);
if(previousTracker != null && (!previousTracker.isDeprecated())
&&
- Math.abs(currentTracker.createdTime -
previousTracker.createdTime) < CHECK_FOR_SWAPPED_TRACKERS_INTERVAL) {
+ delta < CHECK_FOR_SWAPPED_TRACKERS_INTERVAL) {
// Swap prev and current iff H(new key) > H(old key).
// To deal with race conditions (node A gets 1 current
2 prev, node B gets 2 current 1 prev; when we rekey we lose data and cause
problems).
@@ -1936,7 +1937,8 @@
if(logMINOR) Logger.minor(this, "Not swapping
KeyTracker's on "+this+" cur "+currentTracker+" prev "+previousTracker);
}
} else {
- if(logMINOR) Logger.minor(this, "Not swapping
KeyTracker's, no previousTracker or deprecated or not recent enough");
+ if(logMINOR) Logger.minor(this, "Not swapping
KeyTracker's: previousTracker = "+(previousTracker == null ? "null" :
previousTracker.toString()+(previousTracker.isDeprecated()?" (deprecated)":""))+
+ " time delta = "+delta);
}
}
