From 593a01cdc6b666841db9e0c5c20dafb6383dd590 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 29 Jan 2016 15:01:26 +0000
Subject: [PATCH] Removed unnecessary roundtrips between DirectoryServer and Schema
---
opendj-server-legacy/src/main/java/org/opends/server/core/DirectoryServer.java | 9 +--------
opendj-server-legacy/src/main/java/org/opends/server/types/Schema.java | 23 ++---------------------
2 files changed, 3 insertions(+), 29 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/core/DirectoryServer.java b/opendj-server-legacy/src/main/java/org/opends/server/core/DirectoryServer.java
index f2aa8c8..c1b61b6 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/core/DirectoryServer.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/core/DirectoryServer.java
@@ -1458,8 +1458,6 @@
*/
private void bootstrapAttributeSyntaxes()
{
- schema.registerDefaultSyntax(getDefaultSyntax());
-
Syntax[] syntaxes = {
getDefaultBinarySyntax(),
getDefaultBooleanSyntax(),
@@ -2618,7 +2616,7 @@
*/
public static Syntax getDefaultAttributeSyntax()
{
- return directoryServer.getDefaultSyntax();
+ return DirectoryServer.directoryServer.schema.getDefaultSyntax();
}
/**
@@ -2690,11 +2688,6 @@
return CoreSchema.getDirectoryStringSyntax();
}
- private Syntax getDefaultSyntax()
- {
- return CoreSchema.getDirectoryStringSyntax();
- }
-
/**
* Retrieves the set of matching rule uses defined in the Directory Server.
*
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/Schema.java b/opendj-server-legacy/src/main/java/org/opends/server/types/Schema.java
index b08b5a2..1bdc922 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/Schema.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/Schema.java
@@ -57,6 +57,7 @@
import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.schema.AttributeType;
import org.forgerock.opendj.ldap.schema.ConflictingSchemaElementException;
+import org.forgerock.opendj.ldap.schema.CoreSchema;
import org.forgerock.opendj.ldap.schema.MatchingRule;
import org.forgerock.opendj.ldap.schema.SchemaBuilder;
import org.forgerock.opendj.ldap.schema.Syntax;
@@ -122,11 +123,6 @@
private ConcurrentHashMap<String,ObjectClass> objectClasses;
/**
- * The default attribute syntax to use for attributes with no defined syntax.
- */
- private String defaultSyntaxOID;
-
- /**
* The set of matching rule uses for this schema, mapped between the matching
* rule for the definition and the matching rule use itself.
*/
@@ -828,24 +824,9 @@
*/
public Syntax getDefaultSyntax()
{
- return schemaNG.getSyntax(defaultSyntaxOID);
+ return schemaNG.getSyntax(CoreSchema.getDirectoryStringSyntax().getOID());
}
-
-
- /**
- * Registers the defaut syntax for this schema.
- *
- * @param defaultSyntax
- * The defautl syntax to use.
- */
- public void registerDefaultSyntax(Syntax defaultSyntax)
- {
- this.defaultSyntaxOID = defaultSyntax.getOID();
- }
-
-
-
/**
* Registers the provided attribute syntax definition with this
* schema.
--
Gitblit v1.10.0