From 185b77359611fd5799dd77cc6ffb0a8105ece29a Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 30 Apr 2014 15:52:26 +0000
Subject: [PATCH] Fixed broken test ChangeNumberIndexerTest.emptyDBTwoDSsDifferentDomains().
---
opendj-sdk/opendj3-server-dev/src/server/org/opends/server/types/RDN.java | 26 ++++++++++++++------------
1 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/types/RDN.java b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/types/RDN.java
index f9f79b7..6dfa8f1 100644
--- a/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/types/RDN.java
+++ b/opendj-sdk/opendj3-server-dev/src/server/org/opends/server/types/RDN.java
@@ -1186,19 +1186,21 @@
final MatchingRule orderingRule = type.getOrderingMatchingRule();
final MatchingRule rule = orderingRule != null ? orderingRule : type.getEqualityMatchingRule();
- ByteString val1;
- ByteString val2;
- try
+ ByteString val1 = value1;
+ ByteString val2 = value2;
+ if (rule != null)
{
- val1 = rule.normalizeAttributeValue(value1);
- val2 = rule.normalizeAttributeValue(value2);
+ try
+ {
+ val1 = rule.normalizeAttributeValue(val1);
+ val2 = rule.normalizeAttributeValue(val2);
+ return rule.comparator().compare(val1, val2);
+ }
+ catch (DecodeException e)
+ {
+ logger.traceException(e);
+ }
}
- catch (DecodeException e)
- {
- logger.traceException(e);
- val1 = value1;
- val2 = value2;
- }
- return rule.comparator().compare(val1, val2);
+ return val1.toString().compareTo(val2.toString());
}
}
--
Gitblit v1.10.0