From c3ddd7489abd06155b872cc23cef3575e2ee1b9a Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Wed, 08 Jan 2014 09:55:13 +0000
Subject: [PATCH] Align server types API with SDK types API

---
 opendj3-server-dev/src/server/org/opends/server/api/ClientConnection.java |   40 ++++++++++++++++++++--------------------
 1 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/opendj3-server-dev/src/server/org/opends/server/api/ClientConnection.java b/opendj3-server-dev/src/server/org/opends/server/api/ClientConnection.java
index e2a2786..950812b 100644
--- a/opendj3-server-dev/src/server/org/opends/server/api/ClientConnection.java
+++ b/opendj3-server-dev/src/server/org/opends/server/api/ClientConnection.java
@@ -221,23 +221,23 @@
     if (authNEntry != null)
     {
       if ((authZEntry == null) ||
-          authZEntry.getDN().equals(authNEntry.getDN()))
+          authZEntry.getName().equals(authNEntry.getName()))
       {
         DirectoryServer.getAuthenticatedUsers().remove(
-             authNEntry.getDN(), this);
+             authNEntry.getName(), this);
       }
       else
       {
         DirectoryServer.getAuthenticatedUsers().remove(
-             authNEntry.getDN(), this);
+             authNEntry.getName(), this);
         DirectoryServer.getAuthenticatedUsers().remove(
-             authZEntry.getDN(), this);
+             authZEntry.getName(), this);
       }
     }
     else if (authZEntry != null)
     {
       DirectoryServer.getAuthenticatedUsers().remove(
-           authZEntry.getDN(), this);
+           authZEntry.getName(), this);
     }
 
     networkGroup.removeConnection(this);
@@ -884,23 +884,23 @@
       if (authNEntry != null)
       {
         if ((authZEntry == null) ||
-            authZEntry.getDN().equals(authNEntry.getDN()))
+            authZEntry.getName().equals(authNEntry.getName()))
         {
           DirectoryServer.getAuthenticatedUsers().remove(
-               authNEntry.getDN(), this);
+               authNEntry.getName(), this);
         }
         else
         {
           DirectoryServer.getAuthenticatedUsers().remove(
-               authNEntry.getDN(), this);
+               authNEntry.getName(), this);
           DirectoryServer.getAuthenticatedUsers().remove(
-               authZEntry.getDN(), this);
+               authZEntry.getName(), this);
         }
       }
       else if (authZEntry != null)
       {
         DirectoryServer.getAuthenticatedUsers().remove(
-             authZEntry.getDN(), this);
+             authZEntry.getName(), this);
       }
     }
 
@@ -919,17 +919,17 @@
       if (authNEntry != null)
       {
         if ((authZEntry == null) ||
-            authZEntry.getDN().equals(authNEntry.getDN()))
+            authZEntry.getName().equals(authNEntry.getName()))
         {
           DirectoryServer.getAuthenticatedUsers().put(
-               authNEntry.getDN(), this);
+               authNEntry.getName(), this);
         }
         else
         {
           DirectoryServer.getAuthenticatedUsers().put(
-               authNEntry.getDN(), this);
+               authNEntry.getName(), this);
           DirectoryServer.getAuthenticatedUsers().put(
-               authZEntry.getDN(), this);
+               authZEntry.getName(), this);
         }
       }
       else
@@ -937,7 +937,7 @@
         if (authZEntry != null)
         {
           DirectoryServer.getAuthenticatedUsers().put(
-               authZEntry.getDN(), this);
+               authZEntry.getName(), this);
         }
       }
 
@@ -965,10 +965,10 @@
     Entry authZEntry = authenticationInfo.getAuthorizationEntry();
 
     if ((authNEntry != null) &&
-        authNEntry.getDN().equals(oldEntry.getDN()))
+        authNEntry.getName().equals(oldEntry.getName()))
     {
       if ((authZEntry == null) ||
-          (! authZEntry.getDN().equals(authNEntry.getDN())))
+          (! authZEntry.getName().equals(authNEntry.getName())))
       {
         setAuthenticationInfo(
              authenticationInfo.duplicate(newEntry, authZEntry));
@@ -982,7 +982,7 @@
       }
     }
     else if ((authZEntry != null) &&
-             (authZEntry.getDN().equals(oldEntry.getDN())))
+             (authZEntry.getName().equals(oldEntry.getName())))
     {
       setAuthenticationInfo(
            authenticationInfo.duplicate(authNEntry, newEntry));
@@ -1019,7 +1019,7 @@
   public static boolean hasPrivilege(Entry authorizationEntry,
                                    Privilege privilege) {
       boolean isRoot =
-          DirectoryServer.isRootDN(authorizationEntry.getDN());
+          DirectoryServer.isRootDN(authorizationEntry.getName());
       return getPrivileges(authorizationEntry,
               isRoot).contains(privilege) ||
               DirectoryServer.isDisabled(privilege);
@@ -1101,7 +1101,7 @@
         else
         {
           boolean isRoot =
-               DirectoryServer.isRootDN(authorizationEntry.getDN());
+               DirectoryServer.isRootDN(authorizationEntry.getName());
           result = getPrivileges(authorizationEntry,
                                  isRoot).contains(privilege) ||
                    DirectoryServer.isDisabled(privilege);

--
Gitblit v1.10.0