Manual fixes/changes post inlining DirectoryServer.getSchema()

Jean-Noël Rouvignac

25.15.2016 ba663b53d933130d2b6a68c1644e5744428dd1d6

 opendj-server-legacy/src/main/java/org/opends/server/tools/ConfigureDS.java

@@ -57,6 +57,7 @@
import org.forgerock.opendj.ldap.LinkedHashMapEntry;
import org.forgerock.opendj.ldap.schema.AttributeType;
import org.forgerock.opendj.ldap.schema.CoreSchema;
import org.forgerock.opendj.ldap.schema.Schema;
import org.forgerock.opendj.ldap.schema.Syntax;
import org.forgerock.opendj.server.config.client.BackendCfgClient;
import org.forgerock.opendj.server.config.meta.CryptoManagerCfgDefn;
@@ -1137,7 +1138,8 @@
      org.forgerock.opendj.ldap.Entry configEntry, String attrName, Syntax syntax, Object...values)
  {
    org.forgerock.opendj.ldap.Entry newEntry = LinkedHashMapEntry.deepCopyOfEntry(configEntry);
    AttributeType attrType = DirectoryServer.getInstance().getServerContext().getSchema().getAttributeType(attrName, syntax);
    Schema schema = DirectoryServer.getInstance().getServerContext().getSchema();
    AttributeType attrType = schema.getAttributeType(attrName, syntax);
    newEntry.replaceAttribute(new LinkedAttribute(AttributeDescription.create(attrType), values));
    return newEntry;
  }