From 6b0d122dd322bfa1bcbb0c1f4b7551cdb325bb80 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Sat, 10 Nov 2018 14:14:49 +0100 Subject: [PATCH] Fix regression related to tokens --- .../org/argeo/osgi/useradmin/AggregatingUserAdmin.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/org.argeo.enterprise/src/org/argeo/osgi/useradmin/AggregatingUserAdmin.java b/org.argeo.enterprise/src/org/argeo/osgi/useradmin/AggregatingUserAdmin.java index 01254b985..cc1dadb9b 100644 --- a/org.argeo.enterprise/src/org/argeo/osgi/useradmin/AggregatingUserAdmin.java +++ b/org.argeo.enterprise/src/org/argeo/osgi/useradmin/AggregatingUserAdmin.java @@ -88,16 +88,16 @@ public class AggregatingUserAdmin implements UserAdmin { Authorization rawAuthorization = userAdmin.getAuthorization(user); String usernameToUse; String displayNameToUse; - if (user instanceof Group) {// tokens + if (user instanceof Group) { String ownerDn = (String) user.getProperties().get(LdapAttrs.owner.name()); - if (ownerDn != null) { + if (ownerDn != null) {// tokens UserAdmin ownerUserAdmin = findUserAdmin(ownerDn); User ownerUser = (User) ownerUserAdmin.getRole(ownerDn); usernameToUse = ownerDn; displayNameToUse = LdifAuthorization.extractDisplayName(ownerUser); } else { - throw new UserDirectoryException( - "Cannot get authorization for group " + user.getName() + " without owner"); + usernameToUse = rawAuthorization.getName(); + displayNameToUse = rawAuthorization.toString(); } } else {// regular users usernameToUse = rawAuthorization.getName(); -- 2.30.2