r26611 - trunk/freenet/src/freenet/client/async

Author: j16sdiz
Date: 2009-04-07 15:53:25 +0000 (Tue, 07 Apr 2009)
New Revision: 26611

Modified:
   trunk/freenet/src/freenet/client/async/ClientRequestSchedulerBase.java
Log:
Synchronize less

Modified: trunk/freenet/src/freenet/client/async/ClientRequestSchedulerBase.java
===================================================================
--- trunk/freenet/src/freenet/client/async/ClientRequestSchedulerBase.java	2009-04-07 15:53:02 UTC (rev 26610)
+++ trunk/freenet/src/freenet/client/async/ClientRequestSchedulerBase.java	2009-04-07 15:53:25 UTC (rev 26611)
@@ -220,15 +220,20 @@
 		// Do nothing.
 	}
 
-	public synchronized void addPendingKeys(KeyListener listener) {
+	public void addPendingKeys(KeyListener listener) {
 		if(listener == null) throw new NullPointerException();
-		keyListeners.add(listener);
+		synchronized (this) {
+			keyListeners.add(listener);
+		}
 		Logger.normal(this, "Added pending keys to "+this+" : size now "+keyListeners.size()+" : "+listener);
 	}
 	
-	public synchronized boolean removePendingKeys(KeyListener listener) {
-		boolean ret = keyListeners.remove(listener);
-		listener.onRemove();
+	public boolean removePendingKeys(KeyListener listener) {
+		boolean ret;
+		synchronized (this) {
+			ret = keyListeners.remove(listener);
+			listener.onRemove();
+		}
 		Logger.normal(this, "Removed pending keys from "+this+" : size now "+keyListeners.size()+" : "+listener);
 		return ret;
 	}