svn commit: r1601542 - in /openmeetings: branches/3.0.x/src/db/java/org/apache/openmeetings/db/dao/user/UserDao.java trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java

[solomax]

Author: solomax
Date: Tue Jun 10 02:04:34 2014
New Revision: 1601542

URL: http://svn.apache.org/r1601542
Log:
[OPENMEETINGS-1019] UserDao is fixed (get method was broken)

Modified:
    
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dao/user/UserDao.java
    
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java

Modified: 
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dao/user/UserDao.java
URL: 
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dao/user/UserDao.java?rev=1601542&r1=1601541&r2=1601542&view=diff
==============================================================================
--- 
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dao/user/UserDao.java
 (original)
+++ 
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dao/user/UserDao.java
 Tue Jun 10 02:04:34 2014
@@ -33,12 +33,8 @@ import java.util.UUID;
 import javax.persistence.EntityManager;
 import javax.persistence.NoResultException;
 import javax.persistence.PersistenceContext;
-import javax.persistence.TypedQuery;
 
 import org.apache.commons.lang3.StringUtils;
-import org.apache.openjpa.persistence.OpenJPAEntityManager;
-import org.apache.openjpa.persistence.OpenJPAPersistence;
-import org.apache.openjpa.persistence.OpenJPAQuery;
 import org.apache.openmeetings.db.dao.IDataProviderDao;
 import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
 import org.apache.openmeetings.db.entity.user.Address;
@@ -48,11 +44,9 @@ import org.apache.openmeetings.db.entity
 import org.apache.openmeetings.db.util.TimezoneUtil;
 import org.apache.openmeetings.util.DaoHelper;
 import org.apache.openmeetings.util.crypt.ManageCryptStyle;
-import org.apache.wicket.util.string.Strings;
 import org.red5.logging.Red5LoggerFactory;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
 
 /**
  * CRUD operations for {@link User}
@@ -235,7 +229,7 @@ public class UserDao implements IDataPro
                if (user_id > 0) {
                        OpenJPAEntityManager oem = OpenJPAPersistence.cast(em);
                        boolean qrce = 
oem.getFetchPlan().getQueryResultCacheEnabled();
-                       oem.getFetchPlan().setQueryResultCacheEnabled(false);
+                       oem.getFetchPlan().setQueryResultCacheEnabled(false); 
//FIXME update in cache during update
                        TypedQuery<User> q = 
oem.createNamedQuery("getUserById", User.class).setParameter("id", user_id);
                        @SuppressWarnings("unchecked")
                        OpenJPAQuery<User> kq = OpenJPAPersistence.cast(q);
@@ -243,7 +237,11 @@ public class UserDao implements IDataPro
                        if (force) {
                                kq.getFetchPlan().addFetchGroup("backupexport");
                        }
-                       u = kq.getSingleResult();
+                       try {
+                               u = kq.getSingleResult();
+                       } catch (NoResultException ne) {
+                               //no-op
+                       }
                        oem.getFetchPlan().setQueryResultCacheEnabled(qrce);
                } else {
                        log.info("[get] " + "Info: No USER_ID given");

Modified: 
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java?rev=1601542&r1=1601541&r2=1601542&view=diff
==============================================================================
--- 
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java
 (original)
+++ 
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java
 Tue Jun 10 02:04:34 2014
@@ -235,7 +235,7 @@ public class UserDao implements IDataPro
                if (user_id > 0) {
                        OpenJPAEntityManager oem = OpenJPAPersistence.cast(em);
                        boolean qrce = 
oem.getFetchPlan().getQueryResultCacheEnabled();
-                       oem.getFetchPlan().setQueryResultCacheEnabled(false);
+                       oem.getFetchPlan().setQueryResultCacheEnabled(false); 
//FIXME update in cache during update
                        TypedQuery<User> q = 
oem.createNamedQuery("getUserById", User.class).setParameter("id", user_id);
                        @SuppressWarnings("unchecked")
                        OpenJPAQuery<User> kq = OpenJPAPersistence.cast(q);
@@ -243,7 +243,11 @@ public class UserDao implements IDataPro
                        if (force) {
                                kq.getFetchPlan().addFetchGroup("backupexport");
                        }
-                       u = kq.getSingleResult();
+                       try {
+                               u = kq.getSingleResult();
+                       } catch (NoResultException ne) {
+                               //no-op
+                       }
                        oem.getFetchPlan().setQueryResultCacheEnabled(qrce);
                } else {
                        log.info("[get] " + "Info: No USER_ID given");