mirror of https://github.com/OpenIdentityPlatform/OpenDJ.git

Jean-Noel Rouvignac
31.49.2014 a1f030edc5d19b575470f0d79033d9f7471ab172
opendj3-server-dev/src/server/org/opends/server/config/ConfigEntry.java
@@ -345,9 +345,8 @@
    if (conflictingChild != null)
    {
      LocalizableMessage message = ERR_CONFIG_ENTRY_CONFLICTING_CHILD.get(
          conflictingChild.getDN().toString(), entry.getName().toString());
      throw new ConfigException(message);
      throw new ConfigException(ERR_CONFIG_ENTRY_CONFLICTING_CHILD.get(
          conflictingChild.getDN(), entry.getName()));
    }
  }
@@ -377,16 +376,14 @@
        ConfigEntry childEntry = children.get(childDN);
        if (childEntry == null)
        {
          LocalizableMessage message = ERR_CONFIG_ENTRY_NO_SUCH_CHILD.get(
              childDN.toString(), entry.getName().toString());
          throw new ConfigException(message);
          throw new ConfigException(ERR_CONFIG_ENTRY_NO_SUCH_CHILD.get(
              childDN, entry.getName()));
        }
        if (childEntry.hasChildren())
        {
          LocalizableMessage message = ERR_CONFIG_ENTRY_CANNOT_REMOVE_NONLEAF.get(
              childDN.toString(), entry.getName().toString());
          throw new ConfigException(message);
          throw new ConfigException(ERR_CONFIG_ENTRY_CANNOT_REMOVE_NONLEAF.get(
              childDN, entry.getName()));
        }
        children.remove(childDN);