From 0ae536aeab51a8971f78a1d8a6faf0d21899c23c Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 25 Sep 2015 13:44:44 +0000
Subject: [PATCH] OPENDJ-2302 Import is overly case-sensitive
---
opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/Importer.java | 15 ++++++---------
1 files changed, 6 insertions(+), 9 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 0cfa17e..e02361d 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
@@ -4187,12 +4187,10 @@
private boolean insert(DN dn, DatabaseEntry val, DatabaseEntry key)
throws JebException
{
- // Use a compact representation for key
- byte[] dnBytesForKey = dn.toNormalizedByteString().toByteArray();
- key.setData(hashCode(dnBytesForKey));
+ byte[] dnBytes = dn.toNormalizedByteString().toByteArray();
+ key.setData(hashCode(dnBytes));
- // Use a reversible representation for value
- byte[] dnBytesForValue = StaticUtils.getBytes(dn.toString());
+ byte[] dnBytesForValue = dnBytes;
int len = PackedInteger.getWriteIntLength(dnBytesForValue.length);
byte[] dataBytes = new byte[dnBytesForValue.length + len];
int pos = PackedInteger.writeInt(dataBytes, 0, dnBytesForValue.length);
@@ -4280,15 +4278,14 @@
{
Cursor cursor = null;
DatabaseEntry key = new DatabaseEntry();
- byte[] dnBytesForKey = dn.toNormalizedByteString().toByteArray();
- key.setData(hashCode(dnBytesForKey));
+ byte[] dnBytes = dn.toNormalizedByteString().toByteArray();
+ key.setData(hashCode(dnBytes));
try
{
cursor = dnCache.openCursor(null, CursorConfig.DEFAULT);
DatabaseEntry dns = new DatabaseEntry();
OperationStatus status = cursor.getSearchKey(key, dns, LockMode.DEFAULT);
- byte[] dnBytesForValue = StaticUtils.getBytes(dn.toString());
- return status == OperationStatus.SUCCESS && isDNMatched(dns.getData(), dnBytesForValue);
+ return status == OperationStatus.SUCCESS && isDNMatched(dns.getData(), dnBytes);
}
finally
{
--
Gitblit v1.10.0