You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2017/01/12 07:34:56 UTC

svn commit: r1778393 - in /openmeetings/application: branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java

Author: solomax
Date: Thu Jan 12 07:34:56 2017
New Revision: 1778393

URL: http://svn.apache.org/viewvc?rev=1778393&view=rev
Log:
[OPENMEETINGS-1376] handling of 'bad' user settings is added

Modified:
    openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
    openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java

Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java?rev=1778393&r1=1778392&r2=1778393&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java Thu Jan 12 07:34:56 2017
@@ -212,11 +212,11 @@ public class RoomSidebar extends Panel {
 			StringValue s = getRequest().getRequestParameters().getParameterValue(PARAM_SETTINGS);
 			if (!s.isEmpty()) {
 				JSONObject o = new JSONObject(s.toString());
-				room.getClient().setCam(o.getInt("cam"));
-				room.getClient().setMic(o.getInt("mic"));
+				room.getClient().setCam(o.optInt("cam", -1));
+				room.getClient().setMic(o.optInt("mic", -1));
 				boolean interview = Room.Type.interview == room.getRoom().getType();
-				room.getClient().setWidth(interview ? 320 : o.getInt("width"));
-				room.getClient().setHeight(interview ? 260 : o.getInt("height"));
+				room.getClient().setWidth(interview ? 320 : o.optInt("width"));
+				room.getClient().setHeight(interview ? 260 : o.optInt("height"));
 				room.broadcast(target, room.getClient());
 			}
 		}

Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java?rev=1778393&r1=1778392&r2=1778393&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java Thu Jan 12 07:34:56 2017
@@ -212,11 +212,11 @@ public class RoomSidebar extends Panel {
 			StringValue s = getRequest().getRequestParameters().getParameterValue(PARAM_SETTINGS);
 			if (!s.isEmpty()) {
 				JSONObject o = new JSONObject(s.toString());
-				room.getClient().setCam(o.getInt("cam"));
-				room.getClient().setMic(o.getInt("mic"));
+				room.getClient().setCam(o.optInt("cam", -1));
+				room.getClient().setMic(o.optInt("mic", -1));
 				boolean interview = Room.Type.interview == room.getRoom().getType();
-				room.getClient().setWidth(interview ? 320 : o.getInt("width"));
-				room.getClient().setHeight(interview ? 260 : o.getInt("height"));
+				room.getClient().setWidth(interview ? 320 : o.optInt("width"));
+				room.getClient().setHeight(interview ? 260 : o.optInt("height"));
 				room.broadcast(target, room.getClient());
 			}
 		}