From 2d7aad2c25507ea427980b54848c26594c607ae2 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 20 Feb 2014 11:20:22 +0000
Subject: [PATCH] OPENDJ-1308 Migrate schema support
---
opendj3-server-dev/src/server/org/opends/server/schema/UniqueMemberEqualityMatchingRule.java | 24 ++++++------------------
1 files changed, 6 insertions(+), 18 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/schema/UniqueMemberEqualityMatchingRule.java b/opendj3-server-dev/src/server/org/opends/server/schema/UniqueMemberEqualityMatchingRule.java
index 7c3de91..da4f785 100644
--- a/opendj3-server-dev/src/server/org/opends/server/schema/UniqueMemberEqualityMatchingRule.java
+++ b/opendj3-server-dev/src/server/org/opends/server/schema/UniqueMemberEqualityMatchingRule.java
@@ -26,8 +26,6 @@
*/
package org.opends.server.schema;
-
-
import java.util.Collection;
import java.util.Collections;
@@ -35,18 +33,15 @@
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.ldap.ByteSequence;
import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.DecodeException;
import org.opends.server.api.EqualityMatchingRule;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.DN;
-import org.opends.server.types.DirectoryException;
-import org.forgerock.opendj.ldap.ResultCode;
import static org.opends.messages.SchemaMessages.*;
import static org.opends.server.schema.SchemaConstants.*;
import static org.opends.server.util.StaticUtils.*;
-
-
/**
* This class implements the uniqueMemberMatch matching rule defined in X.520
* and referenced in RFC 2252. It is based on the name and optional UID syntax,
@@ -130,12 +125,12 @@
*
* @return The normalized version of the provided value.
*
- * @throws DirectoryException If the provided value is invalid according to
+ * @throws DecodeException If the provided value is invalid according to
* the associated attribute syntax.
*/
@Override
public ByteString normalizeAttributeValue(ByteSequence value)
- throws DirectoryException
+ throws DecodeException
{
String valueString = value.toString().trim();
int valueLength = valueString.length();
@@ -176,18 +171,12 @@
switch (DirectoryServer.getSyntaxEnforcementPolicy())
{
case REJECT:
- throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
- message);
+ throw DecodeException.error(message);
case WARN:
logger.error(message);
-
- valueBuffer.append(toLowerCase(valueString).substring(0, dnEndPos));
- break;
-
- default:
- valueBuffer.append(toLowerCase(valueString).substring(0, dnEndPos));
break;
}
+ valueBuffer.append(toLowerCase(valueString).substring(0, dnEndPos));
}
@@ -216,8 +205,7 @@
switch (DirectoryServer.getSyntaxEnforcementPolicy())
{
case REJECT:
- throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
- message);
+ throw DecodeException.error(message);
case WARN:
if (! logged)
{
--
Gitblit v1.10.0