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

[t...@freenetproject.org]

Author: toad
Date: 2008-03-25 13:33:38 +0000 (Tue, 25 Mar 2008)
New Revision: 18776

Modified:
   trunk/freenet/src/freenet/node/LocationManager.java
Log:
Rename bootID to senderBootID to clarify.

Modified: trunk/freenet/src/freenet/node/LocationManager.java
===================================================================
--- trunk/freenet/src/freenet/node/LocationManager.java 2008-03-25 13:30:16 UTC 
(rev 18775)
+++ trunk/freenet/src/freenet/node/LocationManager.java 2008-03-25 13:33:38 UTC 
(rev 18776)
@@ -741,7 +741,7 @@
         final long addedTime;
         long lastMessageTime; // can delete when no messages for 2*TIMEOUT
         final PeerNode requestSender;
-        final long bootID;
+        final long senderBootID;
         PeerNode routedTo;
         // Set when a request is accepted. Unset when we send one.
         boolean successfullyForwarded;
@@ -751,9 +751,9 @@
             this.outgoingID = outgoingID;
             requestSender = from;
             if(from == null)
-               bootID = -1;
+               senderBootID = -1;
             else
-               bootID = requestSender.getBootID();
+               senderBootID = requestSender.getBootID();
             routedTo = to;
             addedTime = System.currentTimeMillis();
             lastMessageTime = addedTime;
@@ -986,7 +986,7 @@
                     " should be "+item.routedTo+" to "+item.requestSender);
             return true;
         }
-        if(item.bootID != item.routedTo.getBootID()) {
+        if(item.senderBootID != item.routedTo.getBootID()) {
                // Race condition, the node rebooted just after sending the 
reply.
                Message msg = DMT.createFNPSwapRejected(uid);
             try {
@@ -1032,7 +1032,7 @@
             return true;
         }        
         removeRecentlyForwardedItem(item);
-        if(item.bootID != item.routedTo.getBootID()) {
+        if(item.senderBootID != item.routedTo.getBootID()) {
                Logger.normal(this, "Dropping SwapRejected as boot ID has 
changed for "+source);
                return true; // Valid but not forwarded
         }