Author: toad
Date: 2007-09-25 16:04:36 +0000 (Tue, 25 Sep 2007)
New Revision: 15299

Modified:
   trunk/freenet/src/freenet/node/OpennetManager.java
Log:
no need to double-add

Modified: trunk/freenet/src/freenet/node/OpennetManager.java
===================================================================
--- trunk/freenet/src/freenet/node/OpennetManager.java  2007-09-25 16:03:00 UTC 
(rev 15298)
+++ trunk/freenet/src/freenet/node/OpennetManager.java  2007-09-25 16:04:36 UTC 
(rev 15299)
@@ -303,15 +303,13 @@
                                                // Just because it's in the 
global peers list doesn't mean its in the LRU, it may be an old-opennet-peers 
reconnection.
                                                // In which case we add it to 
the global peers list *before* adding it here.
                                        }
-                                               successCount = 0;
-                                               if(addAtLRU)
-                                                       
peersLRU.pushLeast(nodeToAddNow);
-                                               else
-                                                       
peersLRU.push(nodeToAddNow);
-                                               if(logMINOR) Logger.minor(this, 
"Added opennet peer "+nodeToAddNow+" after clearing "+dropList.size()+" items");
-                                               oldPeers.remove(nodeToAddNow);
-                                               // Always take OpennetManager 
lock before PeerManager
-                                               
node.peers.addPeer(nodeToAddNow, true);
+                                       successCount = 0;
+                                       if(addAtLRU)
+                                               
peersLRU.pushLeast(nodeToAddNow);
+                                       else
+                                               peersLRU.push(nodeToAddNow);
+                                       if(logMINOR) Logger.minor(this, "Added 
opennet peer "+nodeToAddNow+" after clearing "+dropList.size()+" items");
+                                       oldPeers.remove(nodeToAddNow);
                                        if(!dropList.isEmpty())
                                                timeLastDropped = now;
                                } else {


Reply via email to