From e2de64564f13999f93e5161eb047709203f52b17 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 13 Nov 2014 15:45:09 +0000
Subject: [PATCH] OPENDJ-1591 (CR-5256) Switch to SDK matching rules
---
opendj3-server-dev/src/server/org/opends/server/backends/jeb/AttributeIndex.java | 20 --------------------
opendj3-server-dev/src/server/org/opends/server/backends/jeb/Indexer.java | 3 +--
2 files changed, 1 insertions(+), 22 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 8116569..71e5f8e 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
@@ -707,26 +707,6 @@
}
/**
- * Delegator to {@link ByteSequence#COMPARATOR}.
- * <p>
- * This intermediate class is necessary to satisfy JE's requirements for a btree comparator.
- *
- * @see com.sleepycat.je.DatabaseConfig#setBtreeComparator(Comparator)
- */
- public static class BSKeyComparator implements Comparator<ByteSequence>
- {
- /** The instance. */
- public static final BSKeyComparator INSTANCE = new BSKeyComparator();
-
- /** {@inheritDoc} */
- @Override
- public int compare(ByteSequence a, ByteSequence b)
- {
- return ByteSequence.COMPARATOR.compare(a, b);
- }
- }
-
- /**
* Close cursors related to the attribute indexes.
*
* @throws DatabaseException If a database error occurs.
diff --git a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/Indexer.java b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/Indexer.java
index 8481f8b..33753ff 100644
--- a/opendj3-server-dev/src/server/org/opends/server/backends/jeb/Indexer.java
+++ b/opendj3-server-dev/src/server/org/opends/server/backends/jeb/Indexer.java
@@ -34,7 +34,6 @@
import org.forgerock.opendj.ldap.ByteSequence;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.spi.IndexingOptions;
-import org.opends.server.backends.jeb.AttributeIndex.BSKeyComparator;
import org.opends.server.backends.jeb.AttributeIndex.KeyComparator;
import org.opends.server.types.Entry;
import org.opends.server.types.Modification;
@@ -64,7 +63,7 @@
*/
public final Comparator<ByteSequence> getBSComparator()
{
- return BSKeyComparator.INSTANCE;
+ return ByteSequence.COMPARATOR;
}
/**
--
Gitblit v1.10.0