Fix OPENDJ-198: RFC 4512 compliance for ldap-toolkit

Matthew Swift

16.00.2011 61be60eef8694b2c28386faf6dd2d7c4e842addd

 opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/AttributeDescription.java

@@ -884,6 +884,8 @@
      final String attributeDescription, final Schema schema)
      throws LocalizedIllegalArgumentException
  {
    final boolean allowMalformedNamesAndOptions = schema
        .allowMalformedNamesAndOptions();
    int i = 0;
    final int length = attributeDescription.length();
    char c = 0;
@@ -933,7 +935,7 @@
        }

        cp = ASCIICharProp.valueOf(c);
        if (!cp.isKeyChar())
        if (!cp.isKeyChar(allowMalformedNamesAndOptions))
        {
          final LocalizableMessage message = ERR_ATTRIBUTE_DESCRIPTION_ILLEGAL_CHARACTER
              .get(attributeDescription, c, i);
@@ -1003,7 +1005,7 @@
    }

    // Get the attribute type from the schema.
    AttributeType attributeType;
    final AttributeType attributeType;
    try
    {
      attributeType = schema.getAttributeType(oid);
@@ -1046,7 +1048,7 @@
      }

      cp = ASCIICharProp.valueOf(c);
      if (!cp.isKeyChar())
      if (!cp.isKeyChar(allowMalformedNamesAndOptions))
      {
        final LocalizableMessage message = ERR_ATTRIBUTE_DESCRIPTION_ILLEGAL_CHARACTER
            .get(attributeDescription, c, i);
@@ -1125,7 +1127,7 @@
        }

        cp = ASCIICharProp.valueOf(c);
        if (!cp.isKeyChar())
        if (!cp.isKeyChar(allowMalformedNamesAndOptions))
        {
          final LocalizableMessage message = ERR_ATTRIBUTE_DESCRIPTION_ILLEGAL_CHARACTER
              .get(attributeDescription, c, i);