From 22094368c2865dcfb6daf8366425212b721a4657 Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Thu, 05 Feb 2009 17:42:14 +0000
Subject: [PATCH] Merge ASN1 branch to trunk
---
opends/src/server/org/opends/server/api/OrderingMatchingRule.java | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/opends/src/server/org/opends/server/api/OrderingMatchingRule.java b/opends/src/server/org/opends/server/api/OrderingMatchingRule.java
index e179685..7c561bf 100644
--- a/opends/src/server/org/opends/server/api/OrderingMatchingRule.java
+++ b/opends/src/server/org/opends/server/api/OrderingMatchingRule.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2006-2008 Sun Microsystems, Inc.
+ * Copyright 2006-2009 Sun Microsystems, Inc.
*/
package org.opends.server.api;
@@ -31,9 +31,8 @@
import java.io.Serializable;
import java.util.Comparator;
-import org.opends.server.types.ByteString;
import org.opends.server.types.ConditionResult;
-
+import org.opends.server.types.ByteSequence;
/**
@@ -76,8 +75,8 @@
* ascending order, or zero if there is no difference
* between the values with regard to ordering.
*/
- public abstract int compareValues(ByteString value1,
- ByteString value2);
+ public abstract int compareValues(ByteSequence value1,
+ ByteSequence value2);
@@ -103,8 +102,8 @@
* a match for the provided assertion value, or
* {@code false} if not.
*/
- public ConditionResult valuesMatch(ByteString attributeValue,
- ByteString assertionValue)
+ public ConditionResult valuesMatch(ByteSequence attributeValue,
+ ByteSequence assertionValue)
{
return ConditionResult.UNDEFINED;
}
--
Gitblit v1.10.0