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

[t...@freenetproject.org]

Author: toad
Date: 2008-02-12 23:50:06 +0000 (Tue, 12 Feb 2008)
New Revision: 17850

Modified:
   trunk/freenet/src/freenet/node/LocationManager.java
Log:
Better this way

Modified: trunk/freenet/src/freenet/node/LocationManager.java
===================================================================
--- trunk/freenet/src/freenet/node/LocationManager.java 2008-02-12 23:49:31 UTC 
(rev 17849)
+++ trunk/freenet/src/freenet/node/LocationManager.java 2008-02-12 23:50:06 UTC 
(rev 17850)
@@ -874,6 +874,7 @@
                        if(incomingMessageQueue.size() > 
MAX_INCOMING_QUEUE_LENGTH) {
                                // Reject anyway.
                                runNow = false;
+                               swapsRejectedAlreadyLocked++;
                                if(logMINOR) Logger.minor(this, "Incoming queue 
length too large: "+incomingMessageQueue.size()+" rejecting "+msg);
                        } else {
                                // Queue it.
@@ -890,9 +891,6 @@
             } catch (NotConnectedException e1) {
                if(logMINOR) Logger.minor(this, "Lost connection rejecting 
SwapRequest (locked) from "+pn);
             }
-            synchronized(this) {
-               swapsRejectedAlreadyLocked++;
-            }
        } else if(runNow) {
                if(logMINOR) Logger.minor(this, "Running "+msg);
                boolean completed = false;