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/extensions/SASLContext.java |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/SASLContext.java b/opendj3-server-dev/src/server/org/opends/server/extensions/SASLContext.java
index 40bb957..a5dbd93 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/SASLContext.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/SASLContext.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2008-2009 Sun Microsystems, Inc.
- *      Portions copyright 2011-2013 ForgeRock AS.
+ *      Portions Copyright 2011-2014 ForgeRock AS.
  */
 package org.opends.server.extensions;
 
@@ -726,7 +726,7 @@
 
     try
     {
-      authzDN = DN.decode(responseAuthzID.substring(3));
+      authzDN = DN.valueOf(responseAuthzID.substring(3));
     }
     catch (final DirectoryException e)
     {
@@ -748,7 +748,7 @@
 
     if (!authzDN.equals(authEntry.getDN()))
     {
-      if (authzDN.isNullDN())
+      if (authzDN.isRootDN())
       {
         authzEntry = null;
       }
@@ -990,7 +990,7 @@
     {
       try
       {
-        e = DirectoryServer.getEntry(DN.nullDN());
+        e = DirectoryServer.getEntry(DN.rootDN());
       }
       catch (final DirectoryException ex)
       {
@@ -1091,7 +1091,7 @@
       DN userDN;
       try
       {
-        userDN = DN.decode(userName.substring(3));
+        userDN = DN.valueOf(userName.substring(3));
       }
       catch (final DirectoryException e)
       {
@@ -1104,7 +1104,7 @@
         return;
       }
 
-      if (userDN.isNullDN())
+      if (userDN.isRootDN())
       {
         setCallbackMsg(ERR_SASL_USERNAME_IS_NULL_DN.get(mechanism));
         return;

--
Gitblit v1.10.0