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/tools/DBTest.java | 17 +++++++----------
1 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/DBTest.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/DBTest.java
index 241f78a..0733f2b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/DBTest.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/DBTest.java
@@ -657,7 +657,7 @@
for(EntryContainer ec : rc.getEntryContainers())
{
builder.startRow();
- builder.appendCell(ec.getBaseDN().toString());
+ builder.appendCell(ec.getBaseDN());
builder.appendCell(ec.getDatabasePrefix());
builder.appendCell(ec.getEntryCount());
count++;
@@ -754,7 +754,7 @@
if(ec == null)
{
printMessage(ERR_DBTEST_NO_ENTRY_CONTAINERS_FOR_BASE_DN.get(
- base.toString(), backend.getBackendID()));
+ base, backend.getBackendID()));
return 1;
}
@@ -925,8 +925,7 @@
EntryContainer ec = rc.getEntryContainer(base);
if(ec == null)
{
- printMessage(ERR_DBTEST_NO_ENTRY_CONTAINERS_FOR_BASE_DN.get(
- base.toString(), backend.getBackendID()));
+ printMessage(ERR_DBTEST_NO_ENTRY_CONTAINERS_FOR_BASE_DN.get(base, backend.getBackendID()));
return 1;
}
@@ -1112,8 +1111,7 @@
EntryContainer ec = rc.getEntryContainer(base);
if(ec == null)
{
- printMessage(ERR_DBTEST_NO_ENTRY_CONTAINERS_FOR_BASE_DN.get(
- base.toString(), backend.getBackendID()));
+ printMessage(ERR_DBTEST_NO_ENTRY_CONTAINERS_FOR_BASE_DN.get(base, backend.getBackendID()));
return 1;
}
@@ -1134,8 +1132,7 @@
if(databaseContainer == null)
{
printMessage(ERR_DBTEST_NO_DATABASE_CONTAINERS_FOR_NAME.get(
- databaseName.getValue(), base.toString(),
- backend.getBackendID()));
+ databaseName.getValue(), base, backend.getBackendID()));
return 1;
}
@@ -1257,7 +1254,7 @@
{
try
{
- formatedKey = ByteString.valueOf(key.getData()).toHexString() + ec.getBaseDN();
+ formatedKey = new String(key.getData()) + ec.getBaseDN();
keyLabel = INFO_LABEL_DBTEST_ENTRY_DN.get();
}
catch(Exception e)
@@ -1493,7 +1490,7 @@
|| databaseContainer instanceof DN2URI)
{
// Encode the value as a DN
- return DN.valueOf(value).toIrreversibleNormalizedByteString().toByteArray();
+ return DN.valueOf(value).toNormalizedByteString().toByteArray();
}
else if(databaseContainer instanceof ID2Entry)
{
--
Gitblit v1.10.0