Inlined DirectoryServer.getSchema()

Jean-Noël Rouvignac

25.17.2016 33047cc2802d7174ad06bc62e972bc9a876abe99

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

@@ -833,7 +833,7 @@
        StringTokenizer tokenizer = new StringTokenizer(rdnAttrNames, "+");
        while (tokenizer.hasMoreTokens())
        {
          attrList.add(DirectoryServer.getSchema().getAttributeType(tokenizer.nextToken()));
          attrList.add(DirectoryServer.getInstance().getServerContext().getSchema().getAttributeType(tokenizer.nextToken()));
        }

        rdnAttributes = new AttributeType[attrList.size()];
@@ -995,7 +995,7 @@
      }
    }

    AttributeType attributeType = DirectoryServer.getSchema().getAttributeType(lowerLine.substring(0, colonPos));
    AttributeType attributeType = DirectoryServer.getInstance().getServerContext().getSchema().getAttributeType(lowerLine.substring(0, colonPos));

    // First, check whether the value is an URL value: <attrName>:< <url>
    int length = line.length();