Author: toad
Date: 2007-10-27 00:07:47 +0000 (Sat, 27 Oct 2007)
New Revision: 15609
Modified:
trunk/freenet/src/freenet/node/PeerManager.java
trunk/freenet/src/freenet/node/PeerNode.java
Log:
noLog
Modified: trunk/freenet/src/freenet/node/PeerManager.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerManager.java 2007-10-26 23:33:13 UTC
(rev 15608)
+++ trunk/freenet/src/freenet/node/PeerManager.java 2007-10-27 00:07:47 UTC
(rev 15609)
@@ -286,7 +286,7 @@
if(myPeers[i] == pn) isInPeers=true;
}
int peerNodeStatus = pn.getPeerNodeStatus();
- removePeerNodeStatus( peerNodeStatus, pn, isInPeers );
+ removePeerNodeStatus( peerNodeStatus, pn, !isInPeers );
String peerNodePreviousRoutingBackoffReason =
pn.getPreviousBackoffReason();
if(peerNodePreviousRoutingBackoffReason != null) {
removePeerNodeRoutingBackoffReason(peerNodePreviousRoutingBackoffReason, pn);
@@ -1149,24 +1149,23 @@
* Remove a PeerNode status from the map
* @param isInPeers If true, complain if the node is not in the peers
list; if false, complain if it is.
*/
- public void removePeerNodeStatus(int pnStatus, PeerNode peerNode,
boolean isInPeers) {
+ public void removePeerNodeStatus(int pnStatus, PeerNode peerNode,
boolean noLog) {
Integer peerNodeStatus = new Integer(pnStatus);
- removePeerNodeStatus(pnStatus, peerNodeStatus, peerNode,
peerNodeStatuses, isInPeers);
+ removePeerNodeStatus(pnStatus, peerNodeStatus, peerNode,
peerNodeStatuses, noLog);
if(!peerNode.isOpennet())
- removePeerNodeStatus(pnStatus, peerNodeStatus,
peerNode, peerNodeStatusesDarknet, isInPeers);
+ removePeerNodeStatus(pnStatus, peerNodeStatus,
peerNode, peerNodeStatusesDarknet, noLog);
}
- private void removePeerNodeStatus(int pnStatus, Integer peerNodeStatus,
PeerNode peerNode, HashMap statuses, boolean isInPeers) {
+ private void removePeerNodeStatus(int pnStatus, Integer peerNodeStatus,
PeerNode peerNode, HashMap statuses, boolean noLog) {
HashSet statusSet = null;
synchronized(statuses) {
if(statuses.containsKey(peerNodeStatus)) {
statusSet = (HashSet)
statuses.get(peerNodeStatus);
if(!statusSet.contains(peerNode)) {
- if(isInPeers)
+ if(!noLog)
Logger.error(this,
"removePeerNodeStatus(): identity '"+peerNode.getIdentityString()+" for
"+peerNode.shortToString()+"' not in peerNodeStatuses with status
'"+PeerNode.getPeerNodeStatusString(peerNodeStatus.intValue())+"'", new
Exception("debug"));
return;
- } else if(!isInPeers)
- Logger.error(this,
"removePeerNodeStatus(): identity '"+peerNode.getIdentityString()+" for
"+peerNode.shortToString()+"' should not be in peerNodeStatuses with given
status '"+PeerNode.getPeerNodeStatusString(peerNodeStatus.intValue())+"'", new
Exception("debug"));
+ }
statuses.remove(peerNodeStatus);
} else {
statusSet = new HashSet();
Modified: trunk/freenet/src/freenet/node/PeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerNode.java 2007-10-26 23:33:13 UTC
(rev 15608)
+++ trunk/freenet/src/freenet/node/PeerNode.java 2007-10-27 00:07:47 UTC
(rev 15609)
@@ -2481,13 +2481,17 @@
}
public int setPeerNodeStatus(long now) {
+ return setPeerNodeStatus(now, false);
+ }
+
+ public int setPeerNodeStatus(long now, boolean noLog) {
long routingBackedOffUntil = getRoutingBackedOffUntil();
synchronized(this) {
int oldPeerNodeStatus = peerNodeStatus;
peerNodeStatus = getPeerNodeStatus(now,
routingBackedOffUntil);
if(peerNodeStatus != oldPeerNodeStatus) {
- peers.removePeerNodeStatus( oldPeerNodeStatus,
this, true );
+ peers.removePeerNodeStatus( oldPeerNodeStatus,
this, noLog );
peers.addPeerNodeStatus( peerNodeStatus, this );
}
@@ -2792,7 +2796,7 @@
if(!disconnecting) return;
disconnecting = false;
}
- setPeerNodeStatus(System.currentTimeMillis());
+ setPeerNodeStatus(System.currentTimeMillis(), true);
}
/** Called when the peer is removed from the PeerManager */
