svn commit: r1358524 - /incubator/openmeetings/branches/2.0/src/org/openmeetings/servlet/outputhandler/ScreenRequestHandler.java

[sebawagner]

Author: sebawagner
Date: Sat Jul  7 08:24:05 2012
New Revision: 1358524

URL: http://svn.apache.org/viewvc?rev=1358524&view=rev
Log:
Merge r1357469 to 2.0 branch

Modified:
    
incubator/openmeetings/branches/2.0/src/org/openmeetings/servlet/outputhandler/ScreenRequestHandler.java

Modified: 
incubator/openmeetings/branches/2.0/src/org/openmeetings/servlet/outputhandler/ScreenRequestHandler.java
URL: 
http://svn.apache.org/viewvc/incubator/openmeetings/branches/2.0/src/org/openmeetings/servlet/outputhandler/ScreenRequestHandler.java?rev=1358524&r1=1358523&r2=1358524&view=diff
==============================================================================
--- 
incubator/openmeetings/branches/2.0/src/org/openmeetings/servlet/outputhandler/ScreenRequestHandler.java
 (original)
+++ 
incubator/openmeetings/branches/2.0/src/org/openmeetings/servlet/outputhandler/ScreenRequestHandler.java
 Sat Jul  7 08:24:05 2012
@@ -124,10 +124,10 @@ public class ScreenRequestHandler extend
                        log.debug("sid: " + sid);
 
                        Long users_id = 
getSessionManagement().checkSession(sid);
-                       if (users_id < 0) {
+                       if (users_id == 0) {
+                               //checkSession will return 0 in case of invalid 
session
                                throw new Exception("Request from invalid user 
" + users_id);
                        }
-
                        String publicSID = 
httpServletRequest.getParameter("publicSID");
                        if (publicSID == null) {
                                throw new Exception("publicSID is empty: " + 
publicSID);
@@ -294,6 +294,7 @@ public class ScreenRequestHandler extend
                                ctx.put("default_quality_screensharing",
                                                default_quality_screensharing);
 
+                               //invited guest does not have valid user_id 
(have user_id == -1)
                                ctx.put("user_id", users_id);
 
                                String port = 
httpServletRequest.getParameter("port");