Inlined DirectoryServer.getSchema()

Jean-Noël Rouvignac

25.17.2016 33047cc2802d7174ad06bc62e972bc9a876abe99

 opendj-server-legacy/src/main/java/org/opends/server/admin/AdministrationDataSync.java

@@ -98,8 +98,8 @@
      return;
    }

    AttributeType attrType1 = DirectoryServer.getSchema().getAttributeType("adminport");
    AttributeType attrType2 = DirectoryServer.getSchema().getAttributeType("adminEnabled");
    AttributeType attrType1 = DirectoryServer.getInstance().getServerContext().getSchema().getAttributeType("adminport");
    AttributeType attrType2 = DirectoryServer.getInstance().getServerContext().getSchema().getAttributeType("adminEnabled");

    LinkedList<Modification> mods = new LinkedList<>();
    mods.add(new Modification(ModificationType.REPLACE, Attributes.create(attrType1, adminPort)));
@@ -222,7 +222,7 @@
    if (!result.isEmpty())
    {
      SearchResultEntry adminConnectorEntry = result.getFirst();
      AttributeType attrType = DirectoryServer.getSchema().getAttributeType(attrName);
      AttributeType attrType = DirectoryServer.getInstance().getServerContext().getSchema().getAttributeType(attrName);
      List<Attribute> attrs = adminConnectorEntry.getAllAttributes(attrType);
      if (!attrs.isEmpty())
      {