From 821d2150765f0ab0ac6ccbbc9f397aa65186d590 Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Wed, 25 Feb 2015 15:56:57 +0000
Subject: [PATCH] OPENDJ-1585 OPENDJ-1843 CR-5758 Improve code related to DN normalization
---
opendj-server-legacy/src/main/java/org/opends/server/tasks/ImportTask.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tasks/ImportTask.java b/opendj-server-legacy/src/main/java/org/opends/server/tasks/ImportTask.java
index 91e0250..e320a11 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tasks/ImportTask.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tasks/ImportTask.java
@@ -362,14 +362,14 @@
{
// The include branches span across multiple backends.
LocalizableMessage message = ERR_LDIFIMPORT_INVALID_INCLUDE_BASE.get(
- includeBranch.toString(), backend.getBackendID());
+ includeBranch, 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.toString());
+ LocalizableMessage message = ERR_NO_BACKENDS_FOR_BASE.get(includeBranch);
throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message);
}
}
@@ -387,7 +387,7 @@
if (!Backend.handlesEntry(includeBranch, defaultIncludeBranches, excludeBranches))
{
LocalizableMessage message = ERR_LDIFIMPORT_INVALID_INCLUDE_BASE.get(
- includeBranch.toString(), backend.getBackendID());
+ includeBranch, backend.getBackendID());
throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message);
}
}
@@ -551,7 +551,7 @@
else if(backend != locatedBackend)
{
// The include branches span across multiple backends.
- logger.error(ERR_LDIFIMPORT_INVALID_INCLUDE_BASE, includeBranch.toString(), backend.getBackendID());
+ logger.error(ERR_LDIFIMPORT_INVALID_INCLUDE_BASE, includeBranch, backend.getBackendID());
return TaskState.STOPPED_BY_ERROR;
}
}
@@ -613,12 +613,12 @@
else
{
// Make sure the selected backend will handle all the include branches
- for(DN includeBranch : includeBranches)
+ for (DN includeBranch : includeBranches)
{
if (! Backend.handlesEntry(includeBranch, defaultIncludeBranches,
excludeBranches))
{
- logger.error(ERR_LDIFIMPORT_INVALID_INCLUDE_BASE, includeBranch.toString(), backend.getBackendID());
+ logger.error(ERR_LDIFIMPORT_INVALID_INCLUDE_BASE, includeBranch, backend.getBackendID());
return TaskState.STOPPED_BY_ERROR;
}
}
--
Gitblit v1.10.0