Commit 6657389e by Tuukka Kivilahti

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

2 parents 0720f073 bf7ca3bd
......@@ -38,7 +38,6 @@ public class SessionHandlerBean implements SessionHandlerBeanLocal {
// TODO Auto-generated constructor stub
}
@Override
public boolean hasPermission(String target, User user, RolePermission permission) {
......@@ -97,14 +96,14 @@ public class SessionHandlerBean implements SessionHandlerBeanLocal {
public User tryLogin(String username, String password) {
User user = userfacade.findByLogin(username.trim());
if(user != null && user.checkPassword(password)) {
if (user != null && user.checkPassword(password)) {
return user;
}
return null;
}
public User getDefaultUser() {
throw new UnsupportedOperationException("Not supported yet.");
return userfacade.getDefaultUser();
}
}
......@@ -4,6 +4,8 @@ import javax.ejb.LocalBean;
import javax.ejb.Stateless;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
import sun.reflect.generics.reflectiveObjects.NotImplementedException;
import fi.insomnia.bortal.model.Product;
@Stateless
......@@ -21,4 +23,8 @@ public class ProductFacade extends GenericFacade<Product> {
return em;
}
public Product getCreditProduct() {
throw new NotImplementedException();
}
}
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!