From 1afeb00abfb007ef9322d2060896353aeb3efdc4 Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Mon, 30 May 2016 10:43:11 +0000
Subject: [PATCH] OPENDJ-2987 Fix all classes that need to use ObjectClass placeholder instead of null
---
opendj-server-legacy/src/main/java/org/opends/server/backends/SchemaBackend.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/SchemaBackend.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/SchemaBackend.java
index 4073a3c..49e0230 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/SchemaBackend.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/SchemaBackend.java
@@ -1467,8 +1467,8 @@
ObjectClass existingClass = schema.getObjectClass(objectClass.getOID());
for (String name : objectClass.getNames())
{
- ObjectClass oc = schema.getObjectClass(toLowerCase(name));
- if (oc == null)
+ ObjectClass oc = schema.getObjectClass(name);
+ if (oc.isPlaceHolder())
{
continue;
}
@@ -1543,7 +1543,7 @@
// If there is no existing class, then we're adding a new objectclass.
// Otherwise, we're replacing an existing one.
- if (existingClass == null)
+ if (existingClass.isPlaceHolder())
{
schema.registerObjectClass(objectClass, false);
addNewSchemaElement(modifiedSchemaFiles, objectClass);
@@ -1592,7 +1592,7 @@
// See if the specified objectclass is actually defined in the server
// schema. If not, then fail.
ObjectClass removeClass = schema.getObjectClass(objectClass.getOID());
- if (removeClass == null || !removeClass.equals(objectClass))
+ if (removeClass.isPlaceHolder() || !removeClass.equals(objectClass))
{
LocalizableMessage message = ERR_SCHEMA_MODIFY_REMOVE_NO_SUCH_OBJECTCLASS.get(
objectClass.getNameOrOID());
@@ -3468,7 +3468,7 @@
// Register this ObjectClass in the new schema
// unless it is already defined with the same syntax.
ObjectClass oldObjectClass = schema.getObjectClass(newObjectClass.getOID());
- if (oldObjectClass == null || !oldObjectClass.toString().equals(newObjectClass.toString()))
+ if (oldObjectClass.isPlaceHolder() || !oldObjectClass.toString().equals(newObjectClass.toString()))
{
newSchema.registerObjectClass(newObjectClass, true);
--
Gitblit v1.10.0