Fix for Issue #615. Add support for multiple object-class inheritance. Supp...

ludovicp

31.16.2010 bb6e844a9964c9e36c12c653dc41ac162d1e1a58

 opendj-sdk/opends/src/server/org/opends/server/util/StaticUtils.java

@@ -4467,16 +4467,17 @@
      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 (! objectClasses.containsKey(superiorClass))
          {
            additionalClasses = new HashSet<ObjectClass>();
          }
            if (additionalClasses == null)
            {
              additionalClasses = new HashSet<ObjectClass>();
            }

          additionalClasses.add(superiorClass);
            additionalClasses.add(superiorClass);
          }
        }
      }

@@ -4498,11 +4499,12 @@
        objectClasses.put(objectClass, objectClass.getNameOrOID());
      }

      ObjectClass superiorClass = objectClass.getSuperiorClass();
      if ((superiorClass != null) &&
          (! objectClasses.containsKey(superiorClass)))
      for(ObjectClass superiorClass : objectClass.getSuperiorClasses())
      {
        addObjectClassChain(superiorClass, objectClasses);
        if (! objectClasses.containsKey(superiorClass))
        {
          addObjectClassChain(superiorClass, objectClasses);
        }
      }
    }
  }