From dc1a95c709158ba2ae660cd940baf81709857a9f Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Mon, 30 May 2016 10:43:10 +0000
Subject: [PATCH] OPENDJ-2987 Update server Schema class to rely on SDK schema for object classes
---
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ServerDescriptor.java | 10 ++++------
1 files changed, 4 insertions(+), 6 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 9d49019..e495683 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
@@ -24,7 +24,6 @@
import java.util.Date;
import java.util.HashSet;
import java.util.List;
-import java.util.Map;
import java.util.Set;
import org.forgerock.opendj.ldap.DN;
@@ -573,16 +572,15 @@
private static boolean areObjectClassesEqual(Schema schema1, Schema schema2)
{
- final Map<String, ObjectClass> ocs1 = schema1.getObjectClasses();
- final Map<String, ObjectClass> ocs2 = schema2.getObjectClasses();
+ final Collection<ObjectClass> ocs1 = schema1.getObjectClasses();
+ final Collection<ObjectClass> ocs2 = schema2.getObjectClasses();
if (ocs1.size() != ocs2.size())
{
return false;
}
- for (String name : ocs1.keySet())
+ for (ObjectClass oc1 : ocs1)
{
- ObjectClass oc1 = ocs1.get(name);
- ObjectClass oc2 = ocs2.get(name);
+ ObjectClass oc2 = schema2.getObjectClass(oc1.getNameOrOID());
if (oc2 == null || !areObjectClassesEqual(oc1, oc2))
{
return false;
--
Gitblit v1.10.0