Author: toad
Date: 2008-12-09 14:11:33 +0000 (Tue, 09 Dec 2008)
New Revision: 24137
Modified:
trunk/freenet/src/freenet/node/OpennetManager.java
Log:
Try to find something to drop without forcing first. Then force to drop,
including disconnected.
Modified: trunk/freenet/src/freenet/node/OpennetManager.java
===================================================================
--- trunk/freenet/src/freenet/node/OpennetManager.java 2008-12-09 13:53:19 UTC
(rev 24136)
+++ trunk/freenet/src/freenet/node/OpennetManager.java 2008-12-09 14:11:33 UTC
(rev 24137)
@@ -405,7 +405,8 @@
if(logMINOR)
Logger.minor(this, "Dropping opennet peers:
currently "+peersLRU.size());
PeerNode toDrop;
- toDrop = peerToDrop(false, true);
+ toDrop = peerToDrop(false, false);
+ if(toDrop == null) toDrop = peerToDrop(false, true);
if(toDrop == null) return;
peersLRU.remove(toDrop);
if(logMINOR)
@@ -424,7 +425,7 @@
for(int i=0;i<peers.length;i++) {
OpennetPeerNode pn = peers[i];
if(pn == null) continue;
- if(!pn.isDroppable(false)) continue;
+ if((!pn.isDroppable(false)) && !force) continue;
// LOCKING: Always take the OpennetManager lock
first
if(!pn.isConnected()) {
if(Logger.shouldLog(Logger.MINOR, this))
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
