[Red5commits] [1764] fixed concurrency issue (Jira SN-32)

[jbauch]

fixed concurrency issue (Jira SN-32)


Timestamp: 03/20/07 17:20:51 EST (less than one hour ago) 
Change: 1764 
Author: jbauch

Files (see diff or trac for details): 
doc/trunk/changelog.txt
java/server/trunk/src/org/red5/server/stream/SimpleBWControlService.java


Trac: http://mirror1.cvsdude.com/trac/osflash/red5/changeset/1764

Index: /java/server/trunk/src/org/red5/server/stream/SimpleBWControlService.java
===================================================================
--- /java/server/trunk/src/org/red5/server/stream/SimpleBWControlService.java (revision 1743)
+++ /java/server/trunk/src/org/red5/server/stream/SimpleBWControlService.java (revision 1764)
@@ -72,5 +72,7 @@
 	public void run() {
 		List<BWContext> contexts = new ArrayList<BWContext>();
-		contexts.addAll(contextMap.values());
+		synchronized (contextMap) {
+			contexts.addAll(contextMap.values());
+		}
 		for (BWContext context : contexts) {
 			synchronized (context) {
@@ -148,5 +150,7 @@
 			context.lastSchedule = -1;
 		}
-		contextMap.put(bc, context);
+		synchronized (contextMap) {
+			contextMap.put(bc, context);
+		}
 		return context;
 	}
@@ -162,5 +166,7 @@
 	public void unregisterBWControllable(IBWControlContext context) {
 		resetBuckets(context);
-		contextMap.remove(context.getBWControllable());
+		synchronized (contextMap) {
+			contextMap.remove(context.getBWControllable());
+		}
 	}
 	
Index: /doc/trunk/changelog.txt
===================================================================
--- /doc/trunk/changelog.txt (revision 1760)
+++ /doc/trunk/changelog.txt (revision 1764)
@@ -28,4 +28,5 @@
 - reference bugs in AMF3 encoder fixed (Jira APPSERVER-81)
 - "NetStream.Play.Failed" is sent correctly now (Jira APPSERVER-52)
+- concurrency issue fixed in SimpleBWControlService (Jira SN-32)
 
 


Note:
Diffs are chopped if more than 25k.
This is to get past the limit on the mailing list.