From 8ce2ccf4110c3847927334138646795dfe50acce Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Mon, 22 Dec 2014 23:13:32 +0000
Subject: [PATCH] OPENDJ-1710: NPE performing deletes and potentially other indexed updates against Persistit backend

---
 opendj3-server-dev/src/server/org/opends/server/backends/pluggable/Index.java |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/Index.java b/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/Index.java
index 4f1ff94..6c8e09a 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/Index.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/pluggable/Index.java
@@ -519,9 +519,7 @@
           success = cursor.positionToKeyOrNext(lower);
 
           // Advance past the lower bound if necessary.
-          if (success
-              && !lowerIncluded
-              && ByteSequence.COMPARATOR.compare(cursor.getKey(), lower) == 0)
+          if (success && !lowerIncluded && cursor.getKey().equals(lower))
           {
             // Do not include the lower value.
             success = cursor.next();
@@ -544,12 +542,13 @@
           // Check against the upper bound if necessary
           if (upper.length() > 0)
           {
-            int cmp = ByteSequence.COMPARATOR.compare(cursor.getKey(), upper);
+            int cmp = cursor.getKey().compareTo(upper);
             if (cmp > 0 || (cmp == 0 && !upperIncluded))
             {
               break;
             }
           }
+
           EntryIDSet list = new EntryIDSet(cursor.getKey(), cursor.getValue());
           if (!list.isDefined())
           {

--
Gitblit v1.10.0