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

[t...@freenetproject.org]

Author: toad
Date: 2008-03-25 13:34:22 +0000 (Tue, 25 Mar 2008)
New Revision: 18777

Modified:
   trunk/freenet/src/freenet/node/LocationManager.java
Log:
Delete rarely useful check that was actually wrong anyway.

Modified: trunk/freenet/src/freenet/node/LocationManager.java
===================================================================
--- trunk/freenet/src/freenet/node/LocationManager.java 2008-03-25 13:33:38 UTC 
(rev 18776)
+++ trunk/freenet/src/freenet/node/LocationManager.java 2008-03-25 13:34:22 UTC 
(rev 18777)
@@ -986,17 +986,6 @@
                     " should be "+item.routedTo+" to "+item.requestSender);
             return true;
         }
-        if(item.senderBootID != item.routedTo.getBootID()) {
-               // Race condition, the node rebooted just after sending the 
reply.
-               Message msg = DMT.createFNPSwapRejected(uid);
-            try {
-                item.requestSender.sendAsync(msg, null, 0, this);
-            } catch (NotConnectedException e) {
-               if(logMINOR) Logger.minor(this, "Lost connection forwarding 
SwapReply converted to SwapRejected: "+uid+" to "+item.requestSender);
-            }
-               Logger.normal(this, "Dropping SwapReply as boot ID has changed 
for "+source);
-               return true; // Valid but not forwarded
-        }
         item.lastMessageTime = System.currentTimeMillis();
         // Returning to source - use incomingID
         m.set(DMT.UID, item.incomingID);