Author: toad
Date: 2007-09-25 16:20:23 +0000 (Tue, 25 Sep 2007)
New Revision: 15302
Modified:
trunk/freenet/src/freenet/node/OpennetManager.java
Log:
ret -> canAdd
Modified: trunk/freenet/src/freenet/node/OpennetManager.java
===================================================================
--- trunk/freenet/src/freenet/node/OpennetManager.java 2007-09-25 16:19:53 UTC
(rev 15301)
+++ trunk/freenet/src/freenet/node/OpennetManager.java 2007-09-25 16:20:23 UTC
(rev 15302)
@@ -240,7 +240,7 @@
*/
public boolean wantPeer(PeerNode nodeToAddNow, boolean addAtLRU) {
boolean notMany = false;
- boolean ret = true;
+ boolean canAdd = true;
boolean noDisconnect;
synchronized(this) {
if(nodeToAddNow != null &&
@@ -284,7 +284,7 @@
if(toDrop == null) {
if(logMINOR)
Logger.minor(this, "No more
peers to drop, cannot accept peer"+(nodeToAddNow == null ? "" :
nodeToAddNow.toString()));
- ret = false;
+ canAdd = false;
break;
}
if(logMINOR)
@@ -294,7 +294,7 @@
peersLRU.remove(toDrop);
dropList.add(toDrop);
}
- if(ret) {
+ if(canAdd) {
long now = System.currentTimeMillis();
if(nodeToAddNow != null) {
// Here we can't avoid nested locks. So
always take the OpennetManager lock first.
@@ -312,7 +312,7 @@
if(logMINOR)
Logger.minor(this,
"Cannot accept peer because of minimum time between offers (last offered
"+(now-timeLastOffered)+" ms ago)");
// Cancel
- ret = false;
+ canAdd = false;
} else {
if(!dropList.isEmpty())
timeLastDropped = now;
@@ -332,7 +332,7 @@
if(logMINOR) Logger.minor(this, "Dropping LRU opennet
peer: "+pn);
node.peers.disconnect(pn, true, true);
}
- return ret;
+ return canAdd;
}
private void dropExcessPeers() {
