Fixed issue #60

git-svn-id: http://red5.googlecode.com/svn/java/server/trunk@4258 1b6495e4-3631-0410-8e05-8f51eee8b9cc
bigbluebutton · Jul 27, 2011 · 5e079a6 · 5e079a6
1 parent 3ae4b33
commit 5e079a6
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/src/org/red5/server/so/ClientSharedObject.java b/src/org/red5/server/so/ClientSharedObject.java
@@ -166,8 +166,13 @@ public void dispatchEvent(IEvent e) {
 							break;
 
 						case CLIENT_UPDATE_ATTRIBUTE:
-							attributes.put(event.getKey(), event.getValue());
-							notifyUpdate(event.getKey(), event.getValue());
+							Object val = event.getValue();
+							// null values are not allowed in concurrent hash maps
+							if (val != null) {
+								attributes.put(event.getKey(), val);
+							}
+							// we will however send the null out to the subscribers
+							notifyUpdate(event.getKey(), val);
 							break;
 
 						default:

diff --git a/src/org/red5/server/stream/StreamingProxy.java b/src/org/red5/server/stream/StreamingProxy.java
@@ -50,8 +50,7 @@
  * @author Steven Gong (steven.gong@gmail.com)
  * @author Andy Shaules (bowljoman@hotmail.com)
  */
-public class StreamingProxy implements IPushableConsumer, IPipeConnectionListener, INetStreamEventHandler,
-		IPendingServiceCallback {
+public class StreamingProxy implements IPushableConsumer, IPipeConnectionListener, INetStreamEventHandler, IPendingServiceCallback {
 
 	private static Logger log = LoggerFactory.getLogger(StreamingProxy.class);
 
@@ -114,7 +113,7 @@ public void onPipeConnectionEvent(PipeConnectionEvent event) {
 		// nothing to do
 	}
 
-	synchronized public void pushMessage(IPipe pipe, IMessage message) throws IOException {
+	public synchronized void pushMessage(IPipe pipe, IMessage message) throws IOException {
 		if (state >= PUBLISHED && message instanceof RTMPMessage) {
 			RTMPMessage rtmpMsg = (RTMPMessage) message;
 			rtmpClient.publishStreamData(streamId, rtmpMsg);