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/datamodel/ServerDescriptor.java | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ServerDescriptor.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ServerDescriptor.java
index e495683..31d6ce8 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ServerDescriptor.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ServerDescriptor.java
@@ -581,7 +581,7 @@
for (ObjectClass oc1 : ocs1)
{
ObjectClass oc2 = schema2.getObjectClass(oc1.getNameOrOID());
- if (oc2 == null || !areObjectClassesEqual(oc1, oc2))
+ if (oc2.isPlaceHolder() || !areObjectClassesEqual(oc1, oc2))
{
return false;
}
@@ -633,7 +633,6 @@
private static boolean areObjectClassesEqual(ObjectClass oc1, ObjectClass oc2)
{
return oc1.getOID().equals(oc2.getOID())
- && oc1.isExtensibleObject() == oc2.isExtensibleObject()
&& areEqual(getDefinitionWithFileName(oc1), getDefinitionWithFileName(oc2))
&& areEqual(oc1.getDescription(), oc2.getDescription())
&& areEqual(oc1.getObjectClassType(), oc2.getObjectClassType())
--
Gitblit v1.10.0