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

code/LanBortalBeans/ejbModule/fi/insomnia/bortal/beans/SessionHandlerBean.java

@@ -38,7 +38,6 @@ public class SessionHandlerBean implements SessionHandlerBeanLocal {
         // TODO Auto-generated constructor stub
         // TODO Auto-generated constructor stub
     }
     }
 
 
-
     @Override
     @Override
     public boolean hasPermission(String target, User user, RolePermission permission) {
     public boolean hasPermission(String target, User user, RolePermission permission) {
 
 
@@ -97,7 +96,7 @@ public class SessionHandlerBean implements SessionHandlerBeanLocal {
     public User tryLogin(String username, String password) {
     public User tryLogin(String username, String password) {
         User user = userfacade.findByLogin(username.trim());
         User user = userfacade.findByLogin(username.trim());
 
 
-        if(user != null && user.checkPassword(password)) {
+        if (user != null && user.checkPassword(password)) {
             return user;
             return user;
         }
         }
 
 
@@ -105,6 +104,6 @@ public class SessionHandlerBean implements SessionHandlerBeanLocal {
     }
     }
 
 
     public User getDefaultUser() {
     public User getDefaultUser() {
-        throw new UnsupportedOperationException("Not supported yet.");
+        return userfacade.getDefaultUser();
     }
     }
 }
 }

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

@@ -4,6 +4,8 @@ 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 sun.reflect.generics.reflectiveObjects.NotImplementedException;
 import fi.insomnia.bortal.model.Product;
 import fi.insomnia.bortal.model.Product;
 
 
 @Stateless
 @Stateless
@@ -21,4 +23,8 @@ public class ProductFacade extends GenericFacade<Product> {
         return em;
         return em;
     }
     }
 
 
+    public Product getCreditProduct() {
+        throw new NotImplementedException();
+    }
+
 }
 }