Make a number of updates to schema processing, all of which fall under the ...

neil_a_wilson

25.59.2007 e5783d9d5e678cb4b8d69d98162c26d2858bbe33

 opends/src/server/org/opends/server/core/SchemaConfigManager.java

@@ -986,7 +986,7 @@
            try
            {
              attrType = attrTypeSyntax.decodeAttributeType(v.getValue(),
                                                            schema);
                                                            schema, false);
            }
            catch (DirectoryException de)
            {
@@ -1058,7 +1058,7 @@
            ObjectClass oc;
            try
            {
              oc = ocSyntax.decodeObjectClass(v.getValue(), schema);
              oc = ocSyntax.decodeObjectClass(v.getValue(), schema, false);
            }
            catch (DirectoryException de)
            {
@@ -1130,7 +1130,7 @@
            NameForm nf;
            try
            {
              nf = nfSyntax.decodeNameForm(v.getValue(), schema);
              nf = nfSyntax.decodeNameForm(v.getValue(), schema, false);
              nf.getExtraProperties().remove(SCHEMA_PROPERTY_FILENAME);
              nf.setSchemaFile(schemaFile);
            }
@@ -1204,7 +1204,7 @@
            DITContentRule dcr;
            try
            {
              dcr = dcrSyntax.decodeDITContentRule(v.getValue(), schema);
              dcr = dcrSyntax.decodeDITContentRule(v.getValue(), schema, false);
              dcr.getExtraProperties().remove(SCHEMA_PROPERTY_FILENAME);
              dcr.setSchemaFile(schemaFile);
            }
@@ -1353,7 +1353,8 @@
            MatchingRuleUse mru;
            try
            {
              mru = mruSyntax.decodeMatchingRuleUse(v.getValue(), schema);
              mru = mruSyntax.decodeMatchingRuleUse(v.getValue(), schema,
                                                    false);
              mru.getExtraProperties().remove(SCHEMA_PROPERTY_FILENAME);
              mru.setSchemaFile(schemaFile);
            }