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

[t...@freenetproject.org]

Author: toad
Date: 2008-02-12 23:44:31 +0000 (Tue, 12 Feb 2008)
New Revision: 17848

Modified:
   trunk/freenet/src/freenet/node/LocationManager.java
Log:
Hopefully fix

Modified: trunk/freenet/src/freenet/node/LocationManager.java
===================================================================
--- trunk/freenet/src/freenet/node/LocationManager.java 2008-02-12 23:44:10 UTC 
(rev 17847)
+++ trunk/freenet/src/freenet/node/LocationManager.java 2008-02-12 23:44:31 UTC 
(rev 17848)
@@ -821,28 +821,7 @@
                if(logMINOR) Logger.minor(this, "Accepting?... "+oldID);
             // Accept - handle locally
                lockOrQueue(m, oldID, newID, pn);
-            if(!lock()) {
-               if(logMINOR) Logger.minor(this, "Can't obtain lock on "+oldID+" 
- rejecting to "+pn);
-                // Reject
-                Message reject = DMT.createFNPSwapRejected(oldID);
-                try {
-                    pn.sendAsync(reject, null, 0, null);
-                } catch (NotConnectedException e1) {
-                       if(logMINOR) Logger.minor(this, "Lost connection 
rejecting SwapRequest (locked) from "+pn);
-                }
-                swapsRejectedAlreadyLocked++;
-                return true;
-            }
-            try {
-                innerHandleSwapRequest(oldID, newID, pn, m);
-                return true;
-            } catch (Error e) {
-                unlock(false);
-                throw e;
-            } catch (RuntimeException e) {
-                unlock(false);
-                throw e;
-            }
+               return true;
         } else {
             m.set(DMT.HTL, htl);
             m.set(DMT.UID, newID);