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

[t...@freenetproject.org]

Author: toad
Date: 2008-02-12 22:57:16 +0000 (Tue, 12 Feb 2008)
New Revision: 17844

Modified:
   trunk/freenet/src/freenet/node/LocationManager.java
Log:
Factor out innerHandleSwapRequest, preparatory to queueing swap requests.

Modified: trunk/freenet/src/freenet/node/LocationManager.java
===================================================================
--- trunk/freenet/src/freenet/node/LocationManager.java 2008-02-12 19:27:17 UTC 
(rev 17843)
+++ trunk/freenet/src/freenet/node/LocationManager.java 2008-02-12 22:57:16 UTC 
(rev 17844)
@@ -809,12 +809,7 @@
                 return true;
             }
             try {
-                item = addForwardedItem(oldID, newID, pn, null);
-                // Locked, do it
-                IncomingSwapRequestHandler isrh =
-                    new IncomingSwapRequestHandler(m, pn, item);
-                if(logMINOR) Logger.minor(this, "Handling... "+oldID);
-                node.executor.execute(isrh, "Incoming swap request handler for 
port "+node.getDarknetPortNumber());
+                innerHandleSwapRequest(oldID, newID, pn, m);
                 return true;
             } catch (Error e) {
                 unlock(false);
@@ -858,7 +853,16 @@
         }
     }

-    private RecentlyForwardedItem addForwardedItem(long uid, long oid, 
PeerNode pn, PeerNode randomPeer) {
+    private void innerHandleSwapRequest(long oldID, long newID, PeerNode pn, 
Message m) {
+       RecentlyForwardedItem item = addForwardedItem(oldID, newID, pn, null);
+        // Locked, do it
+        IncomingSwapRequestHandler isrh =
+            new IncomingSwapRequestHandler(m, pn, item);
+        if(logMINOR) Logger.minor(this, "Handling... "+oldID);
+        node.executor.execute(isrh, "Incoming swap request handler for port 
"+node.getDarknetPortNumber());
+       }
+
+       private RecentlyForwardedItem addForwardedItem(long uid, long oid, 
PeerNode pn, PeerNode randomPeer) {
         RecentlyForwardedItem item = new RecentlyForwardedItem(uid, oid, pn, 
randomPeer);
         synchronized(recentlyForwardedIDs) {
                recentlyForwardedIDs.put(new Long(uid), item);