From d73dd29ce6a19cd9f81bc4db24d50a5b53f45a3c Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Fri, 13 Feb 2015 11:32:45 +0000
Subject: [PATCH] OPENDJ-1689: Remove MatchingRule.comparator() and MatchingRuleImpl.comparator()
---
opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/VLVKeyComparator.java | 13 +++----------
1 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/VLVKeyComparator.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/VLVKeyComparator.java
index 737c3e7..774429a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/VLVKeyComparator.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/jeb/VLVKeyComparator.java
@@ -22,13 +22,10 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.backends.jeb;
-import java.util.Comparator;
-
-import org.forgerock.opendj.ldap.ByteSequence;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.DecodeException;
import org.forgerock.opendj.ldap.ResultCode;
@@ -201,11 +198,9 @@
return -1;
}
- final Comparator<ByteSequence> comp = orderingRules[j].comparator();
final ByteString val1 = ByteString.valueOf(b1Bytes);
final ByteString val2 = ByteString.valueOf(b2Bytes);
- final int result = ascending[j] ? comp.compare(val1, val2) : comp.compare(val2, val1);
-
+ final int result = ascending[j] ? val1.compareTo(val2) : val2.compareTo(val1);
if(result != 0)
{
return result;
@@ -299,9 +294,7 @@
return -1;
}
- final Comparator<ByteSequence> comp = orderingRules[j].comparator();
- final int result = ascending[j] ? comp.compare(b1Bytes, b2Bytes) : comp.compare(b2Bytes, b1Bytes);
-
+ final int result = ascending[j] ? b1Bytes.compareTo(b2Bytes) : b2Bytes.compareTo(b1Bytes);
if(result != 0)
{
return result;
--
Gitblit v1.10.0