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/backends/LDIFBackend.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/LDIFBackend.java b/opendj3-server-dev/src/server/org/opends/server/backends/LDIFBackend.java
index 26b6c14..437c1af 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/LDIFBackend.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/LDIFBackend.java
@@ -547,7 +547,7 @@
{
// Make sure that the target entry does not already exist, but that its
// parent does exist (or that the entry being added is the base DN).
- DN entryDN = entry.getDN();
+ DN entryDN = entry.getName();
if (entryMap.containsKey(entryDN))
{
Message m = ERR_LDIF_BACKEND_ADD_ALREADY_EXISTS.get(entryDN.toString());
@@ -752,7 +752,7 @@
try
{
// Make sure that the target entry exists. If not, then fail.
- DN entryDN = newEntry.getDN();
+ DN entryDN = newEntry.getName();
if (! entryMap.containsKey(entryDN))
{
DN matchedDN = null;
@@ -798,7 +798,7 @@
{
// Make sure that the original entry exists and that the new entry doesn't
// exist but its parent does.
- DN newDN = entry.getDN();
+ DN newDN = entry.getName();
if (! entryMap.containsKey(currentDN))
{
DN matchedDN = null;
@@ -1062,7 +1062,7 @@
{
for (Entry entry : entryMap.values())
{
- entryDN = entry.getDN();
+ entryDN = entry.getName();
ldifWriter.writeEntry(entry);
}
}
@@ -1171,7 +1171,7 @@
// Make sure that we don't already have an entry with the same DN. If
// a duplicate is encountered, then log a message and continue.
- DN entryDN = e.getDN();
+ DN entryDN = e.getName();
if (entryMap.containsKey(entryDN))
{
Message m = ERR_LDIF_BACKEND_DUPLICATE_ENTRY.get(ldifFilePath,
--
Gitblit v1.10.0