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/config/ConfigEntry.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/config/ConfigEntry.java b/opendj3-server-dev/src/server/org/opends/server/config/ConfigEntry.java
index 614251e..bef00b5 100644
--- a/opendj3-server-dev/src/server/org/opends/server/config/ConfigEntry.java
+++ b/opendj3-server-dev/src/server/org/opends/server/config/ConfigEntry.java
@@ -22,6 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.config;
@@ -148,7 +149,7 @@
*/
public DN getDN()
{
- return entry.getDN();
+ return entry.getName();
}
@@ -350,7 +351,7 @@
if (conflictingChild != null)
{
Message message = ERR_CONFIG_ENTRY_CONFLICTING_CHILD.get(
- conflictingChild.getDN().toString(), entry.getDN().toString());
+ conflictingChild.getDN().toString(), entry.getName().toString());
throw new ConfigException(message);
}
}
@@ -382,14 +383,14 @@
if (childEntry == null)
{
Message message = ERR_CONFIG_ENTRY_NO_SUCH_CHILD.get(
- childDN.toString(), entry.getDN().toString());
+ childDN.toString(), entry.getName().toString());
throw new ConfigException(message);
}
if (childEntry.hasChildren())
{
Message message = ERR_CONFIG_ENTRY_CANNOT_REMOVE_NONLEAF.get(
- childDN.toString(), entry.getDN().toString());
+ childDN.toString(), entry.getName().toString());
throw new ConfigException(message);
}
@@ -408,7 +409,7 @@
}
Message message = ERR_CONFIG_ENTRY_CANNOT_REMOVE_CHILD.
- get(String.valueOf(childDN), String.valueOf(entry.getDN()),
+ get(String.valueOf(childDN), String.valueOf(entry.getName()),
stackTraceToSingleLineString(e));
throw new ConfigException(message, e);
}
@@ -562,6 +563,6 @@
@Override
public String toString()
{
- return entry.getDN().toNormalizedString();
+ return entry.getName().toNormalizedString();
}
}
--
Gitblit v1.10.0