From 39cfb739395cca91589c958fda4790c87ce0c9c8 Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Fri, 02 Jan 2015 14:42:16 +0000
Subject: [PATCH] OPENDJ-1585 Re-implement DN normalization in server
---
opendj3-server-dev/src/server/org/opends/server/tasks/ImportTask.java | 19 +++++++++----------
1 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/tasks/ImportTask.java b/opendj3-server-dev/src/server/org/opends/server/tasks/ImportTask.java
index 856c2b0..85fc865 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tasks/ImportTask.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tasks/ImportTask.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2013-2014 ForgeRock AS
+ * Portions Copyright 2013-2015 ForgeRock AS
*/
package org.opends.server.tasks;
@@ -346,7 +346,7 @@
StringBuilder builder = new StringBuilder();
for(DN dn : backend.getBaseDNs())
{
- builder.append(dn.toNormalizedString());
+ builder.append(dn.toString());
builder.append(" ");
}
LocalizableMessage message = ERR_LDIFIMPORT_MISSING_CLEAR_BACKEND.get(
@@ -370,14 +370,14 @@
{
// The include branches span across multiple backends.
LocalizableMessage message = ERR_LDIFIMPORT_INVALID_INCLUDE_BASE.get(
- includeBranch.toNormalizedString(), backend.getBackendID());
+ includeBranch.toString(), backend.getBackendID());
throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message);
}
}
else
{
// The include branch is not associated with any backend.
- LocalizableMessage message = ERR_NO_BACKENDS_FOR_BASE.get(includeBranch.toNormalizedString());
+ LocalizableMessage message = ERR_NO_BACKENDS_FOR_BASE.get(includeBranch.toString());
throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message);
}
}
@@ -395,7 +395,7 @@
if (!Backend.handlesEntry(includeBranch, defaultIncludeBranches, excludeBranches))
{
LocalizableMessage message = ERR_LDIFIMPORT_INVALID_INCLUDE_BASE.get(
- includeBranch.toNormalizedString(), backend.getBackendID());
+ includeBranch.toString(), backend.getBackendID());
throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message);
}
}
@@ -539,11 +539,11 @@
backend.getBaseDNs().length > 1 && !clearBackend)
{
StringBuilder builder = new StringBuilder();
- builder.append(backend.getBaseDNs()[0].toNormalizedString());
+ builder.append(backend.getBaseDNs()[0].toString());
for(int i = 1; i < backend.getBaseDNs().length; i++)
{
builder.append(" / ");
- builder.append(backend.getBaseDNs()[i].toNormalizedString());
+ builder.append(backend.getBaseDNs()[i].toString());
}
logger.error(ERR_LDIFIMPORT_MISSING_CLEAR_BACKEND, builder, ATTR_IMPORT_CLEAR_BACKEND);
return TaskState.STOPPED_BY_ERROR;
@@ -564,8 +564,7 @@
else if(backend != locatedBackend)
{
// The include branches span across multiple backends.
- logger.error(ERR_LDIFIMPORT_INVALID_INCLUDE_BASE, includeBranch
- .toNormalizedString(), backend.getBackendID());
+ logger.error(ERR_LDIFIMPORT_INVALID_INCLUDE_BASE, includeBranch.toString(), backend.getBackendID());
return TaskState.STOPPED_BY_ERROR;
}
}
@@ -640,7 +639,7 @@
if (! Backend.handlesEntry(includeBranch, defaultIncludeBranches,
excludeBranches))
{
- logger.error(ERR_LDIFIMPORT_INVALID_INCLUDE_BASE, includeBranch.toNormalizedString(), backend.getBackendID());
+ logger.error(ERR_LDIFIMPORT_INVALID_INCLUDE_BASE, includeBranch.toString(), backend.getBackendID());
return TaskState.STOPPED_BY_ERROR;
}
}
--
Gitblit v1.10.0