X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;ds=inline;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Facr%2Fdirectory%2FRoleContent.java;h=bf3b319f40bd4aa5f248e2cdb637b5cca74028e4;hb=5c9bae758b5bb13ff3b046ad680886ae540865e8;hp=344dede76d52c7a1ddce15c02c2a601a4828ec8a;hpb=3b4d58678c32d2ca70c79e128e3bde0f6c9cd291;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/acr/directory/RoleContent.java b/org.argeo.cms/src/org/argeo/cms/acr/directory/RoleContent.java
index 344dede76..bf3b319f4 100644
--- a/org.argeo.cms/src/org/argeo/cms/acr/directory/RoleContent.java
+++ b/org.argeo.cms/src/org/argeo/cms/acr/directory/RoleContent.java
@@ -79,17 +79,16 @@ class RoleContent extends AbstractContent {
 	@Override
 	public List<QName> getTypes() {
 		List<QName> contentClasses = new ArrayList<>();
-		keys: for (Enumeration<String> it = role.getProperties().keys(); it.hasMoreElements();) {
-			String key = it.nextElement();
-			if (key.equalsIgnoreCase(LdapAttrs.objectClass.name())) {
-				String[] objectClasses = role.getProperties().get(key).toString().split("\\n");
-				objectClasses: for (String objectClass : objectClasses) {
-					if (LdapObjs.top.name().equalsIgnoreCase(objectClass))
-						continue objectClasses;
-					contentClasses.add(new ContentName(CrName.LDAP_NAMESPACE_URI, objectClass, provider));
-				}
-				break keys;
-			}
+		String objectClass = role.getProperties().get(LdapAttrs.objectClass.name()).toString();
+		contentClasses.add(new ContentName(CrName.LDAP_NAMESPACE_URI, objectClass, provider));
+
+		String[] objectClasses = role.getProperties().get(LdapAttrs.objectClasses.name()).toString().split("\\n");
+		objectClasses: for (String oc : objectClasses) {
+			if (LdapObjs.top.name().equalsIgnoreCase(oc))
+				continue objectClasses;
+			if (objectClass.equalsIgnoreCase(oc))
+				continue objectClasses;
+			contentClasses.add(new ContentName(CrName.LDAP_NAMESPACE_URI, oc, provider));
 		}
 		return contentClasses;
 	}