From 668183d216ba6bcf49e361e5749ac8f2f9a2b780 Mon Sep 17 00:00:00 2001
From: ludovicp <ludovicp@localhost>
Date: Thu, 27 May 2010 14:59:40 +0000
Subject: [PATCH] Fix issue #4468. Now values in filters and indexes are normalized according to the MR used and not the equality MR.
---
opends/src/server/org/opends/server/replication/plugin/HistoricalCsnOrderingMatchingRule.java | 11 ++---------
1 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/plugin/HistoricalCsnOrderingMatchingRule.java b/opends/src/server/org/opends/server/replication/plugin/HistoricalCsnOrderingMatchingRule.java
index c3aead8..5ec8b1a 100644
--- a/opends/src/server/org/opends/server/replication/plugin/HistoricalCsnOrderingMatchingRule.java
+++ b/opends/src/server/org/opends/server/replication/plugin/HistoricalCsnOrderingMatchingRule.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2006-2009 Sun Microsystems, Inc.
+ * Copyright 2006-2010 Sun Microsystems, Inc.
*/
package org.opends.server.replication.plugin;
@@ -67,13 +67,7 @@
*/
public int compareValues(ByteSequence value1, ByteSequence value2)
{
- String[] token1 = value1.toString().split(":", 3);
- String[] token2 = value2.toString().split(":", 3);
-
- if ((token1[1] == null) || (token2[1] == null))
- return -1;
-
- return token1[1].compareTo(token2[1]);
+ return value1.compareTo(value2);
}
@@ -136,7 +130,6 @@
@Override
public ByteString normalizeValue(ByteSequence value)
{
-
String[] token = value.toString().split(":", 3);
/* Change the format of the value to index and start
--
Gitblit v1.10.0