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/api/AuthenticationPolicy.java |   17 ++++++++---------
 1 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/opendj3-server-dev/src/server/org/opends/server/api/AuthenticationPolicy.java b/opendj3-server-dev/src/server/org/opends/server/api/AuthenticationPolicy.java
index f45cc5f..94dc34a 100644
--- a/opendj3-server-dev/src/server/org/opends/server/api/AuthenticationPolicy.java
+++ b/opendj3-server-dev/src/server/org/opends/server/api/AuthenticationPolicy.java
@@ -33,6 +33,7 @@
 
 import org.forgerock.i18n.LocalizableMessage;
 import org.forgerock.i18n.slf4j.LocalizedLogger;
+import org.forgerock.opendj.ldap.ByteString;
 import org.opends.server.core.DirectoryServer;
 import org.opends.server.types.*;
 import org.forgerock.opendj.ldap.ResultCode;
@@ -83,32 +84,30 @@
       {
         if (a.isEmpty()) continue;
 
-        AttributeValue v = a.iterator().next();
+        ByteString v = a.iterator().next();
         DN subentryDN;
         try
         {
-          subentryDN = DN.decode(v.getValue());
+          subentryDN = DN.decode(v);
         }
         catch (Exception e)
         {
           logger.traceException(e);
 
-          logger.trace(
-              "Could not parse password policy subentry DN %s for user %s", v
-                  .getValue(), userDNString, e);
+          logger.trace("Could not parse password policy subentry DN %s for user %s",
+              v, userDNString, e);
 
           if (useDefaultOnError)
           {
             logger.error(ERR_PWPSTATE_CANNOT_DECODE_SUBENTRY_VALUE_AS_DN,
-                v.getValue(), userDNString, e.getMessage());
+                v, userDNString, e.getMessage());
             return DirectoryServer.getDefaultPasswordPolicy();
           }
           else
           {
             LocalizableMessage message = ERR_PWPSTATE_CANNOT_DECODE_SUBENTRY_VALUE_AS_DN
-                .get(v.getValue(), userDNString, e.getMessage());
-            throw new DirectoryException(ResultCode.INVALID_DN_SYNTAX, message,
-                e);
+                .get(v, userDNString, e.getMessage());
+            throw new DirectoryException(ResultCode.INVALID_DN_SYNTAX, message, e);
           }
         }
 

--
Gitblit v1.10.0