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

[t...@freenetproject.org]

Author: toad
Date: 2007-09-22 14:49:24 +0000 (Sat, 22 Sep 2007)
New Revision: 15259

Modified:
   trunk/freenet/src/freenet/node/OpennetManager.java
Log:
Remove from oldPeers list when added to active peers LRU

Modified: trunk/freenet/src/freenet/node/OpennetManager.java
===================================================================
--- trunk/freenet/src/freenet/node/OpennetManager.java  2007-09-22 14:42:58 UTC 
(rev 15258)
+++ trunk/freenet/src/freenet/node/OpennetManager.java  2007-09-22 14:49:24 UTC 
(rev 15259)
@@ -224,6 +224,7 @@
                                peersLRU.pushLeast(nodeToAddNow);
                        else
                                peersLRU.push(nodeToAddNow);
+                       oldPeers.remove(nodeToAddNow);
                }
                dropExcessPeers();
        }
@@ -251,6 +252,7 @@
                                                peersLRU.push(nodeToAddNow);
                                        // Always take OpennetManager lock 
before PeerManager
                                        node.peers.addPeer(nodeToAddNow);
+                                       oldPeers.remove(nodeToAddNow);
                                } else {
                                        if(logMINOR) Logger.minor(this, "Want 
peer because not enough opennet nodes");
                                }
@@ -298,7 +300,8 @@
                                                        
peersLRU.pushLeast(nodeToAddNow);
                                                else
                                                        
peersLRU.push(nodeToAddNow);
-                                               if(logMINOR) Logger.minor(this, 
"Added opennet peer "+nodeToAddNow+" after clearing "+dropList.size()+" 
items");                                        
+                                               if(logMINOR) Logger.minor(this, 
"Added opennet peer "+nodeToAddNow+" after clearing "+dropList.size()+" items");
+                                               oldPeers.remove(nodeToAddNow);
                                        }
                                        if(!dropList.isEmpty())
                                                timeLastDropped = now;