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/util/LDIFReader.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/util/LDIFReader.java b/opendj3-server-dev/src/server/org/opends/server/util/LDIFReader.java
index 147b0e0..1db53ff 100644
--- a/opendj3-server-dev/src/server/org/opends/server/util/LDIFReader.java
+++ b/opendj3-server-dev/src/server/org/opends/server/util/LDIFReader.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2012-2013 ForgeRock AS
+ * Portions Copyright 2012-2014 ForgeRock AS
*/
package org.opends.server.util;
@@ -859,7 +859,7 @@
// base64-encoded. Otherwise, it may be one or more spaces.
if (colonPos == line.length() - 1)
{
- return DN.nullDN();
+ return DN.rootDN();
}
if (line.charAt(colonPos+1) == ':')
@@ -920,7 +920,7 @@
{
try
{
- return DN.decode(dnString);
+ return DN.valueOf(dnString);
}
catch (DirectoryException de)
{
@@ -1550,7 +1550,7 @@
entryDN, "newsuperior");
try
{
- newSuperiorDN = DN.decode(dnStr);
+ newSuperiorDN = DN.valueOf(dnStr);
} catch (DirectoryException de)
{
if (debugEnabled())
@@ -1989,7 +1989,7 @@
Map<AttributeType,List<Attribute>>userAttributes,
Map<AttributeType,List<Attribute>> operationalAttributes)
{
- RDN rdn = entryDN.getRDN();
+ RDN rdn = entryDN.rdn();
int numAVAs = rdn.getNumValues();
for (int i=0; i < numAVAs; i++)
{
--
Gitblit v1.10.0