Author: toad
Date: 2007-09-25 16:05:01 +0000 (Tue, 25 Sep 2007)
New Revision: 15300
Modified:
trunk/freenet/src/freenet/node/OpennetManager.java
Log:
no need to add inside the lock now either.
Modified: trunk/freenet/src/freenet/node/OpennetManager.java
===================================================================
--- trunk/freenet/src/freenet/node/OpennetManager.java 2007-09-25 16:04:36 UTC
(rev 15299)
+++ trunk/freenet/src/freenet/node/OpennetManager.java 2007-09-25 16:05:01 UTC
(rev 15300)
@@ -297,12 +297,6 @@
long now = System.currentTimeMillis();
if(nodeToAddNow != null) {
// Here we can't avoid nested locks. So
always take the OpennetManager lock first.
- if(!node.peers.addPeer(nodeToAddNow)) {
- if(logMINOR)
- Logger.minor(this,
"Already in global peers list: "+nodeToAddNow+" when adding opennet node");
- // 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);
@@ -326,6 +320,12 @@
}
}
}
+ if(!node.peers.addPeer(nodeToAddNow)) {
+ if(logMINOR)
+ Logger.minor(this, "Already in global peers
list: "+nodeToAddNow+" when adding opennet node");
+ // 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.
+ }
for(int i=0;i<dropList.size();i++) {
OpennetPeerNode pn = (OpennetPeerNode) dropList.get(i);
if(logMINOR) Logger.minor(this, "Dropping LRU opennet
peer: "+pn);
