permbean

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

@@ -152,16 +152,16 @@ public class PermissionBean implements PermissionBeanLocal {
 	@Override
 	@Override
 	public boolean isLoggedIn() {
 	public boolean isLoggedIn() {
 
 
-		return !getAnonUser().equals(getCurrentUser()) || getCurrentUser().isSuperadmin();
+		return !getAnonEventUser().equals(getCurrentUser()) || getCurrentUser().isSuperadmin();
 	}
 	}
 
 
 	@Override
 	@Override
 	public EventUser getCurrentUser() {
 	public EventUser getCurrentUser() {
 		Principal principal = context.getCallerPrincipal();
 		Principal principal = context.getCallerPrincipal();
 
 
-		EventUser ret = userfacade.findByLogin(principal.getName());
+		EventUser ret = eventUserFacade.findByLogin(principal.getName());
 		if (ret == null) {
 		if (ret == null) {
-			ret = getAnonUser();
+			ret = getAnonEventUser();
 		}
 		}
 		return ret;
 		return ret;
 	}
 	}
@@ -171,20 +171,6 @@ public class PermissionBean implements PermissionBeanLocal {
 	 * the role.
 	 * the role.
 	 */
 	 */
 	@Override
 	@Override
-	public User getAnonUser() {
-		User defaultUser = userfacade.findByLogin(User.ANONYMOUS_LOGINNAME);
-		if (defaultUser == null) {
-			defaultUser = new User();
-			defaultUser.setLogin(User.ANONYMOUS_LOGINNAME);
-			defaultUser.setNick(User.ANONYMOUS_LOGINNAME);
-			userfacade.create(defaultUser);
-
-			// defaultUser.setSuperadmin(true);
-		}
-		return defaultUser;
-	}
-
-	@Override
 	public EventUser getAnonEventUser() {
 	public EventUser getAnonEventUser() {
 		EventUser defaultUser = eventUserFacade.findByLogin(User.ANONYMOUS_LOGINNAME);
 		EventUser defaultUser = eventUserFacade.findByLogin(User.ANONYMOUS_LOGINNAME);
 		if (defaultUser == null) {
 		if (defaultUser == null) {