From 377b2709c64b32fe93905b466482216c2cc0581c Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 19 Mar 2014 16:30:32 +0000
Subject: [PATCH] OPENDJ-1368 (CR-3232) Remove AttributeValue
---
opendj3-server-dev/src/server/org/opends/server/extensions/StaticGroup.java | 15 ++++-----------
1 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/StaticGroup.java b/opendj3-server-dev/src/server/org/opends/server/extensions/StaticGroup.java
index 8335df1..9281edf 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/StaticGroup.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/StaticGroup.java
@@ -26,8 +26,6 @@
*/
package org.opends.server.extensions;
-
-
import java.util.Collections;
import java.util.LinkedHashSet;
import java.util.LinkedList;
@@ -52,7 +50,6 @@
import org.opends.server.protocols.ldap.LDAPControl;
import org.opends.server.types.Attribute;
import org.opends.server.types.AttributeType;
-import org.opends.server.types.AttributeValue;
import org.opends.server.types.Attributes;
import org.opends.server.types.Control;
import org.opends.server.types.DirectoryConfig;
@@ -71,8 +68,6 @@
import static org.opends.server.util.ServerConstants.*;
import static org.forgerock.util.Reject.*;
-
-
/**
* This class provides a static group implementation, in which the DNs
* of all members are explicitly listed. There are three variants of
@@ -237,25 +232,23 @@
{
for (Attribute a : memberAttrList)
{
- MatchingRule eqRule =
- a.getAttributeType().getEqualityMatchingRule();
- for (AttributeValue v : a)
+ MatchingRule eqRule = a.getAttributeType().getEqualityMatchingRule();
+ for (ByteString v : a)
{
try
{
- someMemberDNs.add(eqRule.normalizeAttributeValue(v.getValue()));
+ someMemberDNs.add(eqRule.normalizeAttributeValue(v));
}
catch (DecodeException de)
{
logger.traceException(de);
- logger.error(ERR_STATICGROUP_CANNOT_DECODE_MEMBER_VALUE_AS_DN, v.getValue(),
+ logger.error(ERR_STATICGROUP_CANNOT_DECODE_MEMBER_VALUE_AS_DN, v,
someMemberAttributeType.getNameOrOID(), groupEntry.getName(), de.getMessageObject());
}
}
}
}
-
return new StaticGroup(groupEntry.getName(),
someMemberAttributeType, someMemberDNs);
}
--
Gitblit v1.10.0