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/backends/jeb/Importer.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/Importer.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/Importer.java
index c31ebfc..e46f193 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/Importer.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/Importer.java
@@ -794,7 +794,7 @@
{
// Create a temp entry container
sourceEntryContainer = entryContainer;
- entryContainer = rootContainer.openEntryContainer(baseDN, baseDN.toIrreversibleReadableString()
+ entryContainer = rootContainer.openEntryContainer(baseDN, baseDN.toNormalizedUrlSafeString()
+ "_importTmp");
}
}
@@ -1039,7 +1039,7 @@
final EntryContainer replacement = suffix.getEntryContainer();
replacement.lock();
- replacement.setDatabasePrefix(baseDN.toIrreversibleReadableString());
+ replacement.setDatabasePrefix(baseDN.toNormalizedUrlSafeString());
replacement.unlock();
rootContainer.registerEntryContainer(baseDN, replacement);
}
@@ -4271,7 +4271,7 @@
throws JebException
{
// Use a compact representation for key
- byte[] dnBytesForKey = dn.toIrreversibleNormalizedByteString().toByteArray();
+ byte[] dnBytesForKey = dn.toNormalizedByteString().toByteArray();
key.setData(hashCode(dnBytesForKey));
// Use a reversible representation for value
@@ -4363,7 +4363,7 @@
{
Cursor cursor = null;
DatabaseEntry key = new DatabaseEntry();
- byte[] dnBytesForKey = dn.toIrreversibleNormalizedByteString().toByteArray();
+ byte[] dnBytesForKey = dn.toNormalizedByteString().toByteArray();
key.setData(hashCode(dnBytesForKey));
try
{
--
Gitblit v1.10.0