From 599c307ea27723bd289516103d4162c56fed7f8e Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Tue, 11 Mar 2014 16:56:01 +0000
Subject: [PATCH] Checkpoint commit for OPENDJ-1308 Migrate schema support
---
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/datamodel/ServerDescriptor.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/datamodel/ServerDescriptor.java b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/datamodel/ServerDescriptor.java
index ed5af94..d4266ce 100644
--- a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/datamodel/ServerDescriptor.java
+++ b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/datamodel/ServerDescriptor.java
@@ -772,7 +772,7 @@
boolean areEqual = attr1.getOID().equals(attr2.getOID()) &&
attr1.isCollective() == attr2.isCollective() &&
attr1.isNoUserModification() == attr2.isNoUserModification() &&
- attr1.isObjectClassType() == attr2.isObjectClassType() &&
+ attr1.isObjectClass() == attr2.isObjectClass() &&
attr1.isObsolete() == attr2.isObsolete() &&
attr1.isOperational() == attr2.isOperational() &&
attr1.isSingleValue() == attr2.isSingleValue();
@@ -788,7 +788,7 @@
attr1.getSubstringMatchingRule(), attr2.getSubstringMatchingRule(),
attr1.getSuperiorType(), attr2.getSuperiorType(),
attr1.getSyntax(), attr2.getSyntax(),
- attr1.getSyntaxOID(), attr2.getSyntaxOID()
+ attr1.getSyntax().getOID(), attr2.getSyntax().getOID()
};
for (int i=0; i<compareWithEqual.length && areEqual; i++)
--
Gitblit v1.10.0