[freenet-cvs] r15620 - trunk/freenet/src/freenet/node

[t...@freenetproject.org]

Author: toad
Date: 2007-10-27 20:14:56 +0000 (Sat, 27 Oct 2007)
New Revision: 15620

Modified:
   trunk/freenet/src/freenet/node/PeerManager.java
   trunk/freenet/src/freenet/node/PeerNode.java
Log:
logging

Modified: trunk/freenet/src/freenet/node/PeerManager.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerManager.java     2007-10-27 20:13:17 UTC 
(rev 15619)
+++ trunk/freenet/src/freenet/node/PeerManager.java     2007-10-27 20:14:56 UTC 
(rev 15620)
@@ -255,7 +255,7 @@
                        myPeers = newMyPeers;
                        Logger.normal(this, "Added " + pn);
                }
-               this.addPeerNodeStatus(pn.getPeerNodeStatus(), pn);
+               this.addPeerNodeStatus(pn.getPeerNodeStatus(), pn, false);
                pn.setPeerNodeStatus(System.currentTimeMillis());
                updatePMUserAlert();
                if((!ignoreOpennet) && pn instanceof OpennetPeerNode) {
@@ -1101,20 +1101,20 @@
        /**
         * Add a PeerNode status to the map
         */
-       public void addPeerNodeStatus(int pnStatus, PeerNode peerNode) {
+       public void addPeerNodeStatus(int pnStatus, PeerNode peerNode, boolean 
noLog) {
                Integer peerNodeStatus = new Integer(pnStatus);
-               addPeerNodeStatuses(pnStatus, peerNode, peerNodeStatus, 
peerNodeStatuses);
+               addPeerNodeStatuses(pnStatus, peerNode, peerNodeStatus, 
peerNodeStatuses, noLog);
                if(!peerNode.isOpennet())
-                       addPeerNodeStatuses(pnStatus, peerNode, peerNodeStatus, 
peerNodeStatusesDarknet);
+                       addPeerNodeStatuses(pnStatus, peerNode, peerNodeStatus, 
peerNodeStatusesDarknet, noLog);
        }

-       private void addPeerNodeStatuses(int pnStatus, PeerNode peerNode, 
Integer peerNodeStatus, HashMap statuses) {
+       private void addPeerNodeStatuses(int pnStatus, PeerNode peerNode, 
Integer peerNodeStatus, HashMap statuses, boolean noLog) {
                HashSet statusSet = null;
                synchronized(statuses) {
                        if(statuses.containsKey(peerNodeStatus)) {
                                statusSet = (HashSet) 
statuses.get(peerNodeStatus);
                                if(statusSet.contains(peerNode)) {
-                                       Logger.error(this, 
"addPeerNodeStatus(): identity '"+peerNode.getIdentityString()+"' already in 
peerNodeStatuses as "+peerNode.getPeer()+" with status 
'"+PeerNode.getPeerNodeStatusString(peerNodeStatus.intValue())+"'", new 
Exception("debug"));
+                                       if(!noLog) Logger.error(this, 
"addPeerNodeStatus(): identity '"+peerNode.getIdentityString()+"' already in 
peerNodeStatuses as "+peerNode.getPeer()+" with status 
'"+PeerNode.getPeerNodeStatusString(peerNodeStatus.intValue())+"'", new 
Exception("debug"));
                                        return;
                                }
                                statuses.remove(peerNodeStatus);

Modified: trunk/freenet/src/freenet/node/PeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerNode.java        2007-10-27 20:13:17 UTC 
(rev 15619)
+++ trunk/freenet/src/freenet/node/PeerNode.java        2007-10-27 20:14:56 UTC 
(rev 15620)
@@ -2492,7 +2492,7 @@

                        if(peerNodeStatus != oldPeerNodeStatus) {
                                peers.removePeerNodeStatus( oldPeerNodeStatus, 
this, noLog );
-                               peers.addPeerNodeStatus( peerNodeStatus, this );
+                               peers.addPeerNodeStatus( peerNodeStatus, this, 
noLog );
                        }

                }