Author: toad
Date: 2008-03-25 13:35:33 +0000 (Tue, 25 Mar 2008)
New Revision: 18778
Modified:
trunk/freenet/src/freenet/node/LocationManager.java
Log:
This is a bad idea too.
Modified: trunk/freenet/src/freenet/node/LocationManager.java
===================================================================
--- trunk/freenet/src/freenet/node/LocationManager.java 2008-03-25 13:34:22 UTC
(rev 18777)
+++ trunk/freenet/src/freenet/node/LocationManager.java 2008-03-25 13:35:33 UTC
(rev 18778)
@@ -741,7 +741,6 @@
final long addedTime;
long lastMessageTime; // can delete when no messages for 2*TIMEOUT
final PeerNode requestSender;
- final long senderBootID;
PeerNode routedTo;
// Set when a request is accepted. Unset when we send one.
boolean successfullyForwarded;
@@ -750,10 +749,6 @@
this.incomingID = id;
this.outgoingID = outgoingID;
requestSender = from;
- if(from == null)
- senderBootID = -1;
- else
- senderBootID = requestSender.getBootID();
routedTo = to;
addedTime = System.currentTimeMillis();
lastMessageTime = addedTime;
@@ -1021,10 +1016,6 @@
return true;
}
removeRecentlyForwardedItem(item);
- if(item.senderBootID != item.routedTo.getBootID()) {
- Logger.normal(this, "Dropping SwapRejected as boot ID has
changed for "+source);
- return true; // Valid but not forwarded
- }
item.lastMessageTime = System.currentTimeMillis();
if(logMINOR) Logger.minor(this, "Forwarding SwapRejected "+uid+" from
"+source+" to "+item.requestSender);
// Returning to source - use incomingID
