From 04c1aca24a2cc5dc8d9a4f22ba05ac74de607f06 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 14 Feb 2014 10:19:01 +0000
Subject: [PATCH] OPENDJ-1308 Migrate schema support

---
 opendj3-server-dev/src/server/org/opends/server/backends/jeb/AttributeIndex.java |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/AttributeIndex.java b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/AttributeIndex.java
index 6fb376b..196f147 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/AttributeIndex.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/AttributeIndex.java
@@ -1095,7 +1095,7 @@
       // Use the ordering matching rule to normalize the value.
       OrderingMatchingRule orderingRule =
            filter.getAttributeType().getOrderingMatchingRule();
-      byte[] lower = orderingRule.normalizeValue(
+      byte[] lower = orderingRule.normalizeAttributeValue(
            filter.getAssertionValue().getValue()).toByteArray();
 
       // Set the upper bound to 0 to search all keys greater then the lower
@@ -1183,7 +1183,7 @@
       // Use the ordering matching rule to normalize the value.
       OrderingMatchingRule orderingRule =
            filter.getAttributeType().getOrderingMatchingRule();
-      byte[] upper = orderingRule.normalizeValue(
+      byte[] upper = orderingRule.normalizeAttributeValue(
            filter.getAssertionValue().getValue()).toByteArray();
 
       if(debugBuffer != null)
@@ -1438,11 +1438,11 @@
 
       // Set the lower bound for a range search.
       byte[] lower =
-          orderingRule.normalizeValue(lowerValue.getValue()).toByteArray();
+          orderingRule.normalizeAttributeValue(lowerValue.getValue()).toByteArray();
 
       // Set the upper bound for a range search.
       byte[] upper =
-          orderingRule.normalizeValue(upperValue.getValue()).toByteArray();
+          orderingRule.normalizeAttributeValue(upperValue.getValue()).toByteArray();
 
       // Read the range: lower <= keys <= upper.
       return orderingIndex.readRange(lower, upper, true, true);
@@ -1534,7 +1534,7 @@
           approximateFilter.getAttributeType().getApproximateMatchingRule();
       // Make a key from the normalized assertion value.
       byte[] keyBytes =
-           approximateMatchingRule.normalizeValue(
+           approximateMatchingRule.normalizeAttributeValue(
                approximateFilter.getAssertionValue().getValue()).toByteArray();
       DatabaseEntry key = new DatabaseEntry(keyBytes);
 

--
Gitblit v1.10.0