svn commit: r1357469 - in /incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings: app/persistence/beans/lang/FieldLanguage.java servlet/outputhandler/ScreenRequestHandler.java

[solomax]

Author: solomax
Date: Thu Jul  5 05:51:02 2012
New Revision: 1357469

URL: http://svn.apache.org/viewvc?rev=1357469&view=rev
Log:
OPENMEETINGS-343 fixed

Modified:
    
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/lang/FieldLanguage.java
    
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/ScreenRequestHandler.java

Modified: 
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/lang/FieldLanguage.java
URL: 
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/lang/FieldLanguage.java?rev=1357469&r1=1357468&r2=1357469&view=diff
==============================================================================
--- 
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/lang/FieldLanguage.java
 (original)
+++ 
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/lang/FieldLanguage.java
 Thu Jul  5 05:51:02 2012
@@ -39,7 +39,7 @@ public class FieldLanguage implements Se
 
        private static final long serialVersionUID = 3501643212388395425L;
        @Id
-       @Column(name="language_id", unique=true, nullable= false)
+       @Column(name="language_id")
        private Long language_id;
        @Column(name="name")
        private String name;

Modified: 
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/ScreenRequestHandler.java
URL: 
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/ScreenRequestHandler.java?rev=1357469&r1=1357468&r2=1357469&view=diff
==============================================================================
--- 
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/ScreenRequestHandler.java
 (original)
+++ 
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/servlet/outputhandler/ScreenRequestHandler.java
 Thu Jul  5 05:51:02 2012
@@ -125,10 +125,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");