svn commit: r1601193 - /openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java

[solomax]

Author: solomax
Date: Sun Jun  8 03:58:49 2014
New Revision: 1601193

URL: http://svn.apache.org/r1601193
Log:
[OPENMEETINGS-942] tests are fixed

Modified:
    
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java

Modified: 
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java?rev=1601193&r1=1601192&r2=1601193&view=diff
==============================================================================
--- 
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java
 (original)
+++ 
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/User.java
 Sun Jun  8 03:58:49 2014
@@ -68,9 +68,12 @@ import org.simpleframework.xml.Root;
  * 
  */
 @Entity
-@FetchGroups({ @FetchGroup(name = "backupexport", attributes = { 
@FetchAttribute(name = "password") }) })
+@FetchGroups({
+       @FetchGroup(name = "backupexport", attributes = { @FetchAttribute(name 
= "password") })
+       , @FetchGroup(name = "orgUsers", attributes = { @FetchAttribute(name = 
"organisation_users")})
+})
 @NamedQueries({
-       @NamedQuery(name = "getUserById", query = "SELECT u FROM User u LEFT 
JOIN FETCH u.organisation_users WHERE u.user_id = :id"),
+       @NamedQuery(name = "getUserById", query = "SELECT u FROM User u WHERE 
u.user_id = :id"),
        @NamedQuery(name = "getUsersByIds", query = "select c from User c where 
c.user_id IN :ids"),
        @NamedQuery(name = "checkUserLogin", query = "SELECT COUNT(u) FROM User 
u WHERE ((:id > 0 AND u.user_id <> :id) OR (:id = 0)) "
                        + "AND u.login = :login AND u.deleted = false"),
@@ -469,6 +472,9 @@ public class User implements Serializabl
        }
 
        public List<Organisation_Users> getOrganisation_users() {
+               if (organisation_users == null) {
+                       organisation_users = new 
ArrayList<Organisation_Users>();
+               }
                return organisation_users;
        }