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

[t...@freenetproject.org]

Author: toad
Date: 2008-01-28 13:19:59 +0000 (Mon, 28 Jan 2008)
New Revision: 17349

Modified:
   trunk/freenet/src/freenet/node/LocationManager.java
Log:
Possibly fix some swapping timeouts?

Modified: trunk/freenet/src/freenet/node/LocationManager.java
===================================================================
--- trunk/freenet/src/freenet/node/LocationManager.java 2008-01-28 13:15:34 UTC 
(rev 17348)
+++ trunk/freenet/src/freenet/node/LocationManager.java 2008-01-28 13:19:59 UTC 
(rev 17349)
@@ -421,12 +421,10 @@
                 if(logMINOR) Logger.minor(this, "Sending SwapRequest "+uid+" 
to "+pn);

                 MessageFilter filter1 =
-                    
MessageFilter.create().setType(DMT.FNPSwapRejected).setField(DMT.UID, 
uid).setSource(pn);
+                    
MessageFilter.create().setType(DMT.FNPSwapRejected).setField(DMT.UID, 
uid).setSource(pn).setTimeout(TIMEOUT);
                 MessageFilter filter2 =
-                    
MessageFilter.create().setType(DMT.FNPSwapReply).setField(DMT.UID, 
uid).setSource(pn);
+                    
MessageFilter.create().setType(DMT.FNPSwapReply).setField(DMT.UID, 
uid).setSource(pn).setTimeout(TIMEOUT);
                 MessageFilter filter = filter1.or(filter2);
-                // 60 seconds
-                filter.setTimeout(TIMEOUT);

                 node.usm.send(pn, m, null);