From a632fbfad0ddbe8b343c6abe8e28dc41e3df9b7e Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 10 Jul 2015 10:16:25 +0000
Subject: [PATCH] Code cleanup
---
opendj-server-legacy/src/main/java/org/opends/server/controls/GetEffectiveRightsRequestControl.java | 24 ++++++++++--------------
1 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/controls/GetEffectiveRightsRequestControl.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/GetEffectiveRightsRequestControl.java
index 0b371d2..7a0fef1 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/controls/GetEffectiveRightsRequestControl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/controls/GetEffectiveRightsRequestControl.java
@@ -26,23 +26,26 @@
*/
package org.opends.server.controls;
+import java.io.IOException;
+import java.util.LinkedList;
+import java.util.List;
+
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.io.ASN1;
import org.forgerock.opendj.io.ASN1Reader;
import org.forgerock.opendj.io.ASN1Writer;
import org.forgerock.opendj.ldap.ByteString;
-import org.opends.server.core.DirectoryServer;
-import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ResultCode;
+import org.opends.server.core.DirectoryServer;
+import org.opends.server.types.AttributeType;
+import org.opends.server.types.Control;
+import org.opends.server.types.DN;
+import org.opends.server.types.DirectoryException;
import static org.opends.messages.ProtocolMessages.*;
import static org.opends.server.util.ServerConstants.*;
-import java.io.IOException;
-import java.util.LinkedList;
-import java.util.List;
-
/**
* This class partially implements the geteffectiverights control as defined
* in draft-ietf-ldapext-acl-model-08.txt. The main differences are:
@@ -116,14 +119,8 @@
attrs = new LinkedList<>();
reader.readStartSequence();
while(reader.hasNextElement()) {
- //Decode as an octet string.
String attrStr = reader.readOctetStringAsString();
- AttributeType attrType = DirectoryServer.getAttributeType(attrStr);
- //Get an attribute type for it and add to the list.
- if (attrType == null) {
- attrType = DirectoryServer.getDefaultAttributeType(attrStr);
- }
- attrs.add(attrType);
+ attrs.add(DirectoryServer.getAttributeType(attrStr, true));
}
reader.readEndSequence();
}
@@ -145,7 +142,6 @@
{
return OID_GET_EFFECTIVE_RIGHTS;
}
-
}
/**
--
Gitblit v1.10.0