Update of /cvsroot/freenet/freenet/src/freenet
In directory sc8-pr-cvs1:/tmp/cvs-serv2740/src/freenet
Modified Files:
OpenConnectionManager.java
Log Message:
HashTable.get() and .remove() is already synchronized methods
Index: OpenConnectionManager.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/OpenConnectionManager.java,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -w -r1.144 -r1.145
--- OpenConnectionManager.java 26 Oct 2003 00:07:22 -0000 1.144
+++ OpenConnectionManager.java 26 Oct 2003 01:54:04 -0000 1.145
@@ -114,12 +114,11 @@
* from the peer handlers.
*/
public NodeReference getNodeReference(Identity id) {
- synchronized(peerHandlers) {
PeerHandler ph = (PeerHandler)(peerHandlers.get(id));
- if(ph == null) return null;
+ if (ph == null)
+ return null;
return ph.getReference();
}
- }
/**
* Add or update a peerhandler, called by Node.reference.
@@ -154,18 +153,15 @@
* to return false.
*/
public boolean needsConnection(Identity i, boolean weak) {
- synchronized(peerHandlers) {
PeerHandler ph = (PeerHandler)(peerHandlers.get(i));
- if(ph == null) return false;
+ if (ph == null)
+ return false;
return ph.needsConnection(weak);
}
- }
public void removePeerHandler(Identity i) {
- synchronized(peerHandlers) {
peerHandlers.remove(i);
}
- }
public void addPeerHandler(Identity i, PeerHandler ph,
boolean allowedToFail) {
@@ -248,11 +244,11 @@
}
public void updateReference(NodeReference ref) {
- if(ref == null) return;
- synchronized(peerHandlers) {
+ if (ref == null)
+ return;
PeerHandler ph = (PeerHandler)(peerHandlers.get(ref.getIdentity()));
- if(ph != null) ph.updateReference(ref);
- }
+ if (ph != null)
+ ph.updateReference(ref);
}
public PeerHandler makePeerHandler(Identity i, NodeReference ref) {
@@ -272,10 +268,8 @@
}
public PeerHandler getPeerHandler(Identity id) {
- synchronized(peerHandlers) {
return (PeerHandler)(peerHandlers.get(id));
}
- }
// Removing a connection that isn't in the OCM is a
// legal NOP.
@@ -768,13 +762,11 @@
*/
private long totalSendQueueSize() {
long total = 0;
- synchronized(peerHandlers) {
- for(Iterator i = peerHandlers.values().iterator();
- i.hasNext();) {
+ Hashtable peers = getPeerHandlersSnapshot();
+ for (Iterator i = peers.values().iterator(); i.hasNext();) {
PeerHandler ph = (PeerHandler)(i.next());
total += ph.queuedBytes();
}
- }
return total;
}
_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs
