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/guitools/controlpanel/ui/ViewEntryPanel.java | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ViewEntryPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ViewEntryPanel.java
index 2d0eeb4..191913a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ViewEntryPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ViewEntryPanel.java
@@ -38,6 +38,7 @@
import org.forgerock.opendj.ldap.AttributeDescription;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.schema.AttributeType;
+import org.forgerock.opendj.ldap.schema.ObjectClass;
import org.forgerock.opendj.ldap.schema.ObjectClassType;
import org.opends.guitools.controlpanel.datamodel.BinaryValue;
import org.opends.guitools.controlpanel.datamodel.CustomSearchResult;
@@ -50,7 +51,6 @@
import org.opends.server.schema.SchemaConstants;
import org.opends.server.types.Attributes;
import org.opends.server.types.Entry;
-import org.forgerock.opendj.ldap.schema.ObjectClass;
import org.opends.server.types.OpenDsException;
import org.opends.server.types.Schema;
import org.opends.server.util.Base64;
@@ -246,9 +246,8 @@
SortedSet<String> auxiliaryClasses = new TreeSet<>();
for (Object o : ocValues)
{
- ObjectClass objectClass =
- schema.getObjectClass(((String)o).toLowerCase());
- if (objectClass != null)
+ ObjectClass objectClass = schema.getObjectClass(((String) o).toLowerCase());
+ if (!objectClass.isPlaceHolder())
{
if (objectClass.getObjectClassType() == ObjectClassType.STRUCTURAL)
{
@@ -361,9 +360,8 @@
Schema schema = getInfo().getServerDescriptor().getSchema();
if (schema != null)
{
- ObjectClass oc =
- schema.getObjectClass(ocValue.getStructural().toLowerCase());
- if (oc != null)
+ ObjectClass oc = schema.getObjectClass(ocValue.getStructural().toLowerCase());
+ if (!oc.isPlaceHolder())
{
Set<String> names = getObjectClassSuperiorValues(oc);
for (String name : names)
--
Gitblit v1.10.0