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/replication/plugin/LDAPReplicationDomain.java | 16 +++++++---------
1 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/LDAPReplicationDomain.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/LDAPReplicationDomain.java
index 4d9e106..1d533d7 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/LDAPReplicationDomain.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/LDAPReplicationDomain.java
@@ -73,6 +73,7 @@
import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.SearchScope;
import org.forgerock.opendj.ldap.schema.AttributeType;
+import org.forgerock.opendj.ldap.schema.ObjectClass;
import org.forgerock.opendj.server.config.meta.ReplicationDomainCfgDefn.IsolationPolicy;
import org.forgerock.opendj.server.config.server.ExternalChangelogDomainCfg;
import org.forgerock.opendj.server.config.server.ReplicationDomainCfg;
@@ -138,7 +139,6 @@
import org.opends.server.types.LDIFExportConfig;
import org.opends.server.types.LDIFImportConfig;
import org.opends.server.types.Modification;
-import org.forgerock.opendj.ldap.schema.ObjectClass;
import org.opends.server.types.Operation;
import org.opends.server.types.OperationType;
import org.opends.server.types.RawModification;
@@ -971,9 +971,8 @@
for (String className : newFractionalSpecificClassesAttributes.keySet())
{
// Does the class exist ?
- ObjectClass fractionalClass = schema.getObjectClass(
- className.toLowerCase());
- if (fractionalClass == null)
+ ObjectClass fractionalClass = schema.getObjectClass(className.toLowerCase());
+ if (fractionalClass.isPlaceHolder())
{
throw new ConfigException(
NOTE_ERR_FRACTIONAL_CONFIG_UNKNOWN_OBJECT_CLASS.get(className));
@@ -4439,9 +4438,8 @@
if (name.startsWith("@"))
{
String ocName = name.substring(1);
- ObjectClass objectClass =
- DirectoryServer.getObjectClass(toLowerCase(ocName));
- if (objectClass != null)
+ ObjectClass objectClass = DirectoryServer.getObjectClass(toLowerCase(ocName));
+ if (!objectClass.isPlaceHolder())
{
for (AttributeType at : objectClass.getRequiredAttributes())
{
@@ -4842,7 +4840,7 @@
{
// Get class from specificClassesAttributes1
ObjectClass objectClass1 = schema.getObjectClass(className1);
- if (objectClass1 == null)
+ if (objectClass1.isPlaceHolder())
{
throw new ConfigException(
NOTE_ERR_FRACTIONAL_CONFIG_UNKNOWN_OBJECT_CLASS.get(className1));
@@ -4853,7 +4851,7 @@
for (String className2 : specificClassesAttrs2.keySet())
{
ObjectClass objectClass2 = schema.getObjectClass(className2);
- if (objectClass2 == null)
+ if (objectClass2.isPlaceHolder())
{
throw new ConfigException(
NOTE_ERR_FRACTIONAL_CONFIG_UNKNOWN_OBJECT_CLASS.get(className2));
--
Gitblit v1.10.0