From 27d6fa4d5acd2cb46d620876f65a6633b82c6be8 Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Mon, 30 May 2016 13:58:13 +0000
Subject: [PATCH] OPENDJ-3001 Migrate NameForm to SDK
---
opendj-server-legacy/src/main/java/org/opends/server/schema/DITStructureRuleSyntax.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/DITStructureRuleSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/DITStructureRuleSyntax.java
index 36b94ad..ecf7fa5 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/DITStructureRuleSyntax.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/DITStructureRuleSyntax.java
@@ -27,13 +27,13 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.opendj.ldap.ByteSequence;
import org.forgerock.opendj.ldap.ResultCode;
+import org.forgerock.opendj.ldap.schema.NameForm;
import org.forgerock.opendj.ldap.schema.Syntax;
import org.forgerock.opendj.server.config.server.AttributeSyntaxCfg;
import org.opends.server.api.AttributeSyntax;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.DITStructureRule;
import org.opends.server.types.DirectoryException;
-import org.opends.server.types.NameForm;
import org.opends.server.types.Schema;
/**
@@ -318,12 +318,14 @@
pos = readWOID(lowerStr, woidBuffer, pos);
nameFormGiven = true;
- nameForm = schema.getNameForm(woidBuffer.toString());
- if (nameForm == null && ! allowUnknownElements)
+
+ String nameOrOid = woidBuffer.toString();
+ if (!schema.hasNameForm(nameOrOid) && !allowUnknownElements)
{
throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
ERR_ATTR_SYNTAX_DSR_UNKNOWN_NAME_FORM.get(valueStr, woidBuffer));
}
+ nameForm = schema.getNameForm(nameOrOid);
}
else if (lowerTokenName.equals("sup"))
{
--
Gitblit v1.10.0