From 85811b64468e9b7a876bd352a0299b904a53a3fb 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
---
opends/src/server/org/opends/server/workflowelement/ndb/NDBAddOperation.java | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/opends/src/server/org/opends/server/workflowelement/ndb/NDBAddOperation.java b/opends/src/server/org/opends/server/workflowelement/ndb/NDBAddOperation.java
index d0b4872..9c8635f 100644
--- a/opends/src/server/org/opends/server/workflowelement/ndb/NDBAddOperation.java
+++ b/opends/src/server/org/opends/server/workflowelement/ndb/NDBAddOperation.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2008-2009 Sun Microsystems, Inc.
+ * Copyright 2008-2010 Sun Microsystems, Inc.
*/
package org.opends.server.workflowelement.ndb;
@@ -307,16 +307,18 @@
HashSet<ObjectClass> additionalClasses = null;
for (ObjectClass oc : objectClasses.keySet())
{
- ObjectClass superiorClass = oc.getSuperiorClass();
- if ((superiorClass != null) &&
- (! objectClasses.containsKey(superiorClass)))
+ for(ObjectClass superiorClass : oc.getSuperiorClasses())
{
- if (additionalClasses == null)
+ if ((superiorClass != null) &&
+ (! objectClasses.containsKey(superiorClass)))
{
- additionalClasses = new HashSet<ObjectClass>();
- }
+ if (additionalClasses == null)
+ {
+ additionalClasses = new HashSet<ObjectClass>();
+ }
- additionalClasses.add(superiorClass);
+ additionalClasses.add(superiorClass);
+ }
}
}
--
Gitblit v1.10.0