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/authorization/dseecompat/UserAttr.java | 10 ++--------
1 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/UserAttr.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/UserAttr.java
index e4d5da9..a4009fa 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/UserAttr.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/UserAttr.java
@@ -201,10 +201,7 @@
private EnumEvalResult evalVAL(AciEvalContext evalCtx) {
EnumEvalResult matched= EnumEvalResult.FALSE;
boolean undefined=false;
- AttributeType attrType = DirectoryServer.getAttributeType(attrStr);
- if (attrType == null) {
- attrType = DirectoryServer.getDefaultAttributeType(attrStr);
- }
+ AttributeType attrType = DirectoryServer.getAttributeType(attrStr, true);
final SearchRequest request = newSearchRequest(evalCtx.getClientDN(), SearchScope.BASE_OBJECT);
InternalSearchOperation op = getRootConnection().processSearch(request);
LinkedList<SearchResultEntry> result = op.getSearchEntries();
@@ -232,10 +229,7 @@
private EnumEvalResult evalURL(AciEvalContext evalCtx) {
EnumEvalResult matched= EnumEvalResult.FALSE;
boolean undefined=false;
- AttributeType attrType = DirectoryServer.getAttributeType(attrStr);
- if (attrType == null) {
- attrType = DirectoryServer.getDefaultAttributeType(attrStr);
- }
+ AttributeType attrType = DirectoryServer.getAttributeType(attrStr, true);
List<Attribute> attrs=evalCtx.getResourceEntry().getAttribute(attrType);
if(!attrs.isEmpty()) {
for(Attribute a : attrs) {
--
Gitblit v1.10.0