From bb6e844a9964c9e36c12c653dc41ac162d1e1a58 Mon Sep 17 00:00:00 2001
From: ludovicp <ludovicp@localhost>
Date: Mon, 31 May 2010 12:16:23 +0000
Subject: [PATCH] Fix for Issue #615. Add support for multiple object-class inheritance. Support added in the schema, core server and tools including Control-Panel

---
 opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/ServerDescriptor.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/ServerDescriptor.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/ServerDescriptor.java
index 80da30d..c3c8fe7 100644
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/ServerDescriptor.java
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/ServerDescriptor.java
@@ -846,7 +846,7 @@
           oc1.getObjectClassType(), oc2.getObjectClassType(),
           oc1.getOptionalAttributes(), oc2.getOptionalAttributes(),
           oc1.getRequiredAttributes(), oc2.getRequiredAttributes(),
-          oc1.getSuperiorClass(), oc2.getSuperiorClass()
+          oc1.getSuperiorClasses(), oc2.getSuperiorClasses()
       };
 
       for (int i=0; i<compareWithEqual.length && areEqual; i++)

--
Gitblit v1.10.0