muutama init bugi

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

@@ -124,7 +124,9 @@ public class UserBean implements UserBeanLocal {
         if (defaultUser == null) {
         if (defaultUser == null) {
             defaultUser = new User();
             defaultUser = new User();
             defaultUser.setLogin(DEFAULT_USER_LOGIN);
             defaultUser.setLogin(DEFAULT_USER_LOGIN);
+            defaultUser.setNick(DEFAULT_USER_LOGIN);
             userFacade.create(defaultUser);
             userFacade.create(defaultUser);
+            
             defaultUser.setSuperadmin(true);
             defaultUser.setSuperadmin(true);
         }
         }
         return defaultUser;
         return defaultUser;

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

@@ -47,7 +47,9 @@ public class RoleFacade extends EventChildGenericFacade<Role> {
     public Collection<Role> findAllParentsExcluding(Collection<Role> roles, Collection<Role> excludedResults) {
     public Collection<Role> findAllParentsExcluding(Collection<Role> roles, Collection<Role> excludedResults) {
         Set<Role> ret = new HashSet<Role>();
         Set<Role> ret = new HashSet<Role>();
         for (Role r : roles) {
         for (Role r : roles) {
-            ret.addAll(r.getParents());
+            if (r != null) {
+                ret.addAll(r.getParents());
+            }
         }
         }
 
 
         ret.removeAll(excludedResults);
         ret.removeAll(excludedResults);