OPENDJ-3037 inlined DirectoryServer.getAttributeType(String)

Jean-Noël Rouvignac

07.03.2016 3d4c0acccda6e62b23f248d75c1cc6721fc20bdf

 opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/LDAPReplicationDomain.java

@@ -765,7 +765,7 @@
    final SearchResultEntry resultEntry = getFirstResult(searchOperation);
    if (resultEntry != null)
    {
      AttributeType synchronizationGenIDType = DirectoryServer.getAttributeType(REPLICATION_GENERATION_ID);
      AttributeType synchronizationGenIDType = DirectoryServer.getSchema().getAttributeType(REPLICATION_GENERATION_ID);
      List<Attribute> attrs = resultEntry.getAttribute(synchronizationGenIDType);
      if (!attrs.isEmpty())
      {
@@ -786,7 +786,7 @@

  private Iterator<ByteString> getAttributeValueIterator(SearchResultEntry resultEntry, String attrName)
  {
    AttributeType attrType = DirectoryServer.getAttributeType(attrName);
    AttributeType attrType = DirectoryServer.getSchema().getAttributeType(attrName);
    List<Attribute> exclAttrs = resultEntry.getAttribute(attrType);
    if (!exclAttrs.isEmpty())
    {
@@ -1365,7 +1365,7 @@
    Set<AttributeType> results = new HashSet<>();
    for (String attrName : fractionalConcernedAttributes)
    {
      results.add(DirectoryServer.getAttributeType(attrName));
      results.add(DirectoryServer.getSchema().getAttributeType(attrName));
    }
    return results;
  }
@@ -3289,8 +3289,7 @@
      SearchResultEntry resultEntry = result.get(0);
      if (resultEntry != null)
      {
        AttributeType synchronizationGenIDType = DirectoryServer.getAttributeType(REPLICATION_GENERATION_ID);
        List<Attribute> attrs = resultEntry.getAttribute(synchronizationGenIDType);
        List<Attribute> attrs = resultEntry.getAttribute(REPLICATION_GENERATION_ID);
        if (!attrs.isEmpty())
        {
          Attribute attr = attrs.get(0);
@@ -3442,7 +3441,7 @@
      Set<AttributeType> includeAttributes = new HashSet<>();
      for (String attrName : includeAttributeStrings)
      {
        includeAttributes.add(DirectoryServer.getAttributeType(attrName));
        includeAttributes.add(DirectoryServer.getSchema().getAttributeType(attrName));
      }
      exportConfig.setIncludeAttributes(includeAttributes);
    }