Merge branch 'master' of dev.intra.insomnia.fi:/data/bortal

code/LanBortalBeans/ejbModule/fi/insomnia/bortal/facade/UserFacade.java

@@ -4,6 +4,7 @@ import javax.ejb.LocalBean;
 import javax.ejb.Stateless;
 import javax.ejb.Stateless;
 import javax.persistence.EntityManager;
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
 import javax.persistence.PersistenceContext;
+import javax.persistence.Query;
 import javax.persistence.TypedQuery;
 import javax.persistence.TypedQuery;
 
 
 import fi.insomnia.bortal.model.User;
 import fi.insomnia.bortal.model.User;
@@ -32,7 +33,7 @@ public class UserFacade extends IntegerPkGenericFacade<User> {
 //        return q.getSingleResult();
 //        return q.getSingleResult();
         TypedQuery<User> q = em.createQuery("SELECT u FROM User u WHERE u.login = :login", User.class);
         TypedQuery<User> q = em.createQuery("SELECT u FROM User u WHERE u.login = :login", User.class);
         q.setParameter("login", login);
         q.setParameter("login", login);
-        return q.getSingleResult();
+        return (User) q.getSingleResult();
     }
     }
 
 
     public User getOrCreateDefaultUser() {
     public User getOrCreateDefaultUser() {