From c9ad45317bcbe8940c9cc4d55ee47ae4b19f08c1 Mon Sep 17 00:00:00 2001 From: Bruno Sinou Date: Wed, 16 Dec 2015 08:01:13 +0000 Subject: [PATCH] Trivial enhancement git-svn-id: https://svn.argeo.org/commons/trunk@8703 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- .../cms/util/useradmin/UserAdminUtils.java | 20 ++++++++----------- 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/org.argeo.cms/src/org/argeo/cms/util/useradmin/UserAdminUtils.java b/org.argeo.cms/src/org/argeo/cms/util/useradmin/UserAdminUtils.java index e6e3e91e0..3a67717f6 100644 --- a/org.argeo.cms/src/org/argeo/cms/util/useradmin/UserAdminUtils.java +++ b/org.argeo.cms/src/org/argeo/cms/util/useradmin/UserAdminUtils.java @@ -161,18 +161,14 @@ public class UserAdminUtils { // HELPERS TO RETRIEVE REMARKABLE PROPERTIES /** Simply retrieves the user uid from his dn with no useradmin */ public static String getUserUid(String dn) { - try { - LdapName ldapName = new LdapName(dn); - Rdn last = ldapName.getRdn(ldapName.size() - 1); - if (last.getType().toLowerCase().equals(LdifName.uid.name()) - || last.getType().toLowerCase().equals(LdifName.cn.name())) - return (String) last.getValue(); - else - throw new ArgeoException("Cannot retrieve user uid, " - + "non valid dn: " + dn); - } catch (InvalidNameException e) { - throw new ArgeoException("Cannot parse LDAP name " + dn, e); - } + LdapName ldapName = getLdapName(dn); + Rdn last = ldapName.getRdn(ldapName.size() - 1); + if (last.getType().toLowerCase().equals(LdifName.uid.name()) + || last.getType().toLowerCase().equals(LdifName.cn.name())) + return (String) last.getValue(); + else + throw new ArgeoException("Cannot retrieve user uid, " + + "non valid dn: " + dn); } /** -- 2.30.2