svn commit: r1727890 - in /openmeetings/application: branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/

[solomax]

Author: solomax
Date: Mon Feb  1 04:55:08 2016
New Revision: 1727890

URL: http://svn.apache.org/viewvc?rev=1727890&view=rev
Log:
ClassCastException while connecting of screen-sharing applet is fixed

Modified:
    
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
    
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java

Modified: 
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
URL: 
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java?rev=1727890&r1=1727889&r2=1727890&view=diff
==============================================================================
--- 
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
 (original)
+++ 
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
 Mon Feb  1 04:55:08 2016
@@ -182,11 +182,11 @@ public class ScopeApplicationAdapter ext
                if (map.containsKey("screenClient")) {
                        //TODO add check for room rights
                        String parentSid = (String)map.get("parentSid");
-                       
rcm.setRoomId(Long.parseLong(conn.getScope().getName()));
+                       rcm.setRoomId(Long.valueOf(conn.getScope().getName()));
                        rcm.setScreenClient(true);
                        
SessionVariablesUtil.setIsScreenClient(conn.getClient());
                        
-                       rcm.setUserId((Long)map.get("userId"));
+                       rcm.setUserId(new Long((Integer)map.get("userId")));
                        SessionVariablesUtil.setUserId(conn.getClient(), 
rcm.getUserId());
 
                        rcm.setStreamPublishName(parentSid);

Modified: 
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
URL: 
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java?rev=1727890&r1=1727889&r2=1727890&view=diff
==============================================================================
--- 
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
 (original)
+++ 
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
 Mon Feb  1 04:55:08 2016
@@ -173,11 +173,11 @@ public class ScopeApplicationAdapter ext
                if (map.containsKey("screenClient")) {
                        //TODO add check for room rights
                        String parentSid = (String)map.get("parentSid");
-                       
rcm.setRoomId(Long.parseLong(conn.getScope().getName()));
+                       rcm.setRoomId(Long.valueOf(conn.getScope().getName()));
                        rcm.setScreenClient(true);
                        
SessionVariablesUtil.setIsScreenClient(conn.getClient());
                        
-                       rcm.setUserId((Long)map.get("userId"));
+                       rcm.setUserId(new Long((Integer)map.get("userId")));
                        SessionVariablesUtil.setUserId(conn.getClient(), 
rcm.getUserId());
 
                        rcm.setStreamPublishName(parentSid);