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

[t...@freenetproject.org]

Author: toad
Date: 2007-09-14 18:51:29 +0000 (Fri, 14 Sep 2007)
New Revision: 15173

Modified:
   trunk/freenet/src/freenet/node/PeerManager.java
Log:
Rename variable for less confusion

Modified: trunk/freenet/src/freenet/node/PeerManager.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerManager.java     2007-09-14 18:50:45 UTC 
(rev 15172)
+++ trunk/freenet/src/freenet/node/PeerManager.java     2007-09-14 18:51:29 UTC 
(rev 15173)
@@ -990,22 +990,22 @@
                        addPeerNodeStatuses(pnStatus, peerNode, peerNodeStatus, 
peerNodeStatusesDarknet);
        }

-       private void addPeerNodeStatuses(int pnStatus, PeerNode peerNode, 
Integer peerNodeStatus, HashMap peerNodeStatuses) {
+       private void addPeerNodeStatuses(int pnStatus, PeerNode peerNode, 
Integer peerNodeStatus, HashMap statuses) {
                HashSet statusSet = null;
-               synchronized(peerNodeStatuses) {
-                       if(peerNodeStatuses.containsKey(peerNodeStatus)) {
-                               statusSet = (HashSet) 
peerNodeStatuses.get(peerNodeStatus);
+               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())+"'");
                                        return;
                                }
-                               peerNodeStatuses.remove(peerNodeStatus);
+                               statuses.remove(peerNodeStatus);
                        } else {
                                statusSet = new HashSet();
                        }
                        if(logMINOR) Logger.minor(this, "addPeerNodeStatus(): 
adding PeerNode for '"+peerNode.getIdentityString()+"' with status 
'"+PeerNode.getPeerNodeStatusString(peerNodeStatus.intValue())+"'");
                        statusSet.add(peerNode);
-                       peerNodeStatuses.put(peerNodeStatus, statusSet);
+                       statuses.put(peerNodeStatus, statusSet);
                }
        }