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

[t...@freenetproject.org]

Author: toad
Date: 2007-09-15 16:14:35 +0000 (Sat, 15 Sep 2007)
New Revision: 15189

Modified:
   trunk/freenet/src/freenet/node/PeerManager.java
Log:
Change name of variable to avoid confusion

Modified: trunk/freenet/src/freenet/node/PeerManager.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerManager.java     2007-09-15 16:13:35 UTC 
(rev 15188)
+++ trunk/freenet/src/freenet/node/PeerManager.java     2007-09-15 16:14:35 UTC 
(rev 15189)
@@ -1093,16 +1093,16 @@
                        removePeerNodeStatus(pnStatus, peerNodeStatus, 
peerNode, peerNodeStatusesDarknet);
        }

-       private void removePeerNodeStatus(int pnStatus, Integer peerNodeStatus, 
PeerNode peerNode, HashMap peerNodeStatuses) {
+       private void removePeerNodeStatus(int pnStatus, Integer peerNodeStatus, 
PeerNode peerNode, 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, 
"removePeerNodeStatus(): identity '"+peerNode.getIdentityString()+"' not in 
peerNodeStatuses with status 
'"+PeerNode.getPeerNodeStatusString(peerNodeStatus.intValue())+"'", new 
Exception("debug"));
                                        return;
                                }
-                               peerNodeStatuses.remove(peerNodeStatus);
+                               statuses.remove(peerNodeStatus);
                        } else {
                                statusSet = new HashSet();
                        }
@@ -1110,7 +1110,7 @@
                        if(statusSet.contains(peerNode)) {
                                statusSet.remove(peerNode);
                        }
-                       peerNodeStatuses.put(peerNodeStatus, statusSet);
+                       statuses.put(peerNodeStatus, statusSet);
                }
        }