diff --git a/account/src/main/java/de/muehlencord/shared/account/business/application/control/ApplicationRoleControl.java b/account/src/main/java/de/muehlencord/shared/account/business/application/control/ApplicationRoleControl.java index 4a40f34..e693907 100644 --- a/account/src/main/java/de/muehlencord/shared/account/business/application/control/ApplicationRoleControl.java +++ b/account/src/main/java/de/muehlencord/shared/account/business/application/control/ApplicationRoleControl.java @@ -117,7 +117,10 @@ public class ApplicationRoleControl implements Serializable { public List getRolePermissions(ApplicationRoleEntity role) throws AccountException { ApplicationRoleEntity existingRole = em.find(ApplicationRoleEntity.class, role.getId()); List permissions = existingRole.getApplicationPermissionList(); - permissions.size(); // force list to load + if ((permissions != null) && (permissions.isEmpty())) { + permissions.size(); // force list to load + } + return permissions; }