openmeetings-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sebawag...@apache.org
Subject svn commit: r1441315 - in /openmeetings/trunk/singlewebapp: WebContent/swf10/video/editRecordStreamSWF10.lzx src/org/apache/openmeetings/session/store/HashMapStore.java
Date Fri, 01 Feb 2013 04:26:18 GMT
Author: sebawagner
Date: Fri Feb  1 04:26:17 2013
New Revision: 1441315

URL: http://svn.apache.org/viewvc?rev=1441315&view=rev
Log:
OPENMEETINGS-460 Fixes nullpointer exception in getClientByRoomId and fixes roomId correctly
set in SWF10 rtmp-connection Client object

Modified:
    openmeetings/trunk/singlewebapp/WebContent/swf10/video/editRecordStreamSWF10.lzx
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/store/HashMapStore.java

Modified: openmeetings/trunk/singlewebapp/WebContent/swf10/video/editRecordStreamSWF10.lzx
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/swf10/video/editRecordStreamSWF10.lzx?rev=1441315&r1=1441314&r2=1441315&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/swf10/video/editRecordStreamSWF10.lzx (original)
+++ openmeetings/trunk/singlewebapp/WebContent/swf10/video/editRecordStreamSWF10.lzx Fri Feb
 1 04:26:17 2013
@@ -177,7 +177,7 @@
                 if ($debug) Debug.write("parent.setUserAVSettings -2- ",parent.remoteMessage);
                 if ($debug) Debug.write("parent.setUserAVSettings -3- ",parent.cam_default_width);
                 if ($debug) Debug.write("parent.setUserAVSettings -4- ",parent.cam_default_height);
-                if ($debug) Debug.write("parent.setUserAVSettings -5- ",canvas.currentRoomObject.rooms_id);
+                if ($debug) Debug.write("parent.setUserAVSettings -5a- ",canvas.currentRoomObject.rooms_id);
                 if ($debug) Debug.write("parent.setUserAVSettings -6- ",canvas.publicSID);
                 
                 parent.setUserAVSettings.doCall();
@@ -191,7 +191,7 @@
         <netparam><method name="getValue">return parent.parent.remoteMessage;</method></netparam>
         <netparam><method name="getValue">return parent.parent.cam_default_width;</method></netparam>
         <netparam><method name="getValue">return parent.parent.cam_default_height;</method></netparam>
-        <netparam><method name="getValue">return parent.parent.cam_default_height;</method></netparam>
+        <netparam><method name="getValue">return canvas.currentRoomObject.rooms_id;</method></netparam>
         <netparam><method name="getValue">return canvas.publicSID;</method></netparam>
         <netparam><method name="getValue">return parent.parent.interviewPodId;</method></netparam>
         <handler name="ondata" args="value">

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/store/HashMapStore.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/store/HashMapStore.java?rev=1441315&r1=1441314&r2=1441315&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/store/HashMapStore.java
(original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/store/HashMapStore.java
Fri Feb  1 04:26:17 2013
@@ -109,7 +109,7 @@ public class HashMapStore implements ICl
 	public  LinkedHashMap<String, Client> getClientsByRoomId(Long roomId) {
 		LinkedHashMap<String,Client> clientList = new LinkedHashMap<String, Client>();
 		for (Client cl : clientsByStreamId.values()) {
-			if (cl.getRoom_id().equals(roomId)) {
+			if (cl.getRoom_id() != null && cl.getRoom_id().equals(roomId)) {
 				clientList.put(cl.getStreamid(), cl);
 			}
 		}



Mime
View raw message