From a90890af51b755a0a6862a32306b1a979d5a9612 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 11 Mar 2014 13:42:19 +0000
Subject: [PATCH] OPENDJ-1368 (CR-3157) Remove AttributeValue

---
 opendj3-server-dev/src/server/org/opends/server/backends/jeb/AttributeIndex.java |    9 +++++----
 1 files changed, 5 insertions(+), 4 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 070aba2..b646ad4 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
@@ -2223,9 +2223,10 @@
       try
       {
         // Make a key from the normalized assertion value.
-        byte[] keyBytes =
-          extensibleFilter.getAssertionValue().getNormalizedValue().
-          toByteArray();
+        MatchingRule rule =
+            extensibleFilter.getAttributeType().getEqualityMatchingRule();
+        ByteString value = extensibleFilter.getAssertionValue().getValue();
+        byte[] keyBytes = rule.normalizeAssertionValue(value).toByteArray();
         DatabaseEntry key = new DatabaseEntry(keyBytes);
 
         if(debugBuffer != null)
@@ -2265,7 +2266,7 @@
         }
         return idSet;
       }
-      catch (DirectoryException e)
+      catch (DecodeException e)
       {
         logger.traceException(e);
         return IndexQuery.createNullIndexQuery().evaluate(null);

--
Gitblit v1.10.0