From c01c421b26e6409febd6af1db1c9db11b7b347a4 Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Tue, 07 Jan 2014 15:06:31 +0000
Subject: [PATCH] Align server types API with SDK types API

---
 opendj3-server-dev/src/server/org/opends/server/admin/DNPropertyDefinition.java |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/opendj3-server-dev/src/server/org/opends/server/admin/DNPropertyDefinition.java b/opendj3-server-dev/src/server/org/opends/server/admin/DNPropertyDefinition.java
index 0b1f88e..891d388 100644
--- a/opendj3-server-dev/src/server/org/opends/server/admin/DNPropertyDefinition.java
+++ b/opendj3-server-dev/src/server/org/opends/server/admin/DNPropertyDefinition.java
@@ -22,6 +22,7 @@
  *
  *
  *      Copyright 2008 Sun Microsystems, Inc.
+ *      Portions Copyright 2014 ForgeRock AS
  */
 
 package org.opends.server.admin;
@@ -85,7 +86,7 @@
         setBaseDN((DN) null);
       } else {
         try {
-          setBaseDN(DN.decode(baseDN));
+          setBaseDN(DN.valueOf(baseDN));
         } catch (DirectoryException e) {
           throw new IllegalArgumentException(e);
         }
@@ -174,10 +175,10 @@
     ensureNotNull(value);
 
     if (baseDN != null) {
-      DN parent = value.getParent();
+      DN parent = value.parent();
 
       if (parent == null) {
-        parent = DN.nullDN();
+        parent = DN.rootDN();
       }
 
       if (!parent.equals(baseDN)) {
@@ -197,7 +198,7 @@
     ensureNotNull(value);
 
     try {
-      DN dn = DN.decode(value);
+      DN dn = DN.valueOf(value);
       validateValue(dn);
       return dn;
     } catch (DirectoryException e) {

--
Gitblit v1.10.0