You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ka...@apache.org on 2010/08/14 20:21:54 UTC
svn commit: r985554 -
/directory/shared/trunk/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/DefaultSchemaManager.java
Author: kayyagari
Date: Sat Aug 14 18:21:53 2010
New Revision: 985554
URL: http://svn.apache.org/viewvc?rev=985554&view=rev
Log:
o removed redundant loading of schema when no errors are present
Modified:
directory/shared/trunk/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/DefaultSchemaManager.java
Modified: directory/shared/trunk/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/DefaultSchemaManager.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/DefaultSchemaManager.java?rev=985554&r1=985553&r2=985554&view=diff
==============================================================================
--- directory/shared/trunk/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/DefaultSchemaManager.java (original)
+++ directory/shared/trunk/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/DefaultSchemaManager.java Sat Aug 14 18:21:53 2010
@@ -1043,24 +1043,16 @@ public class DefaultSchemaManager implem
if ( errors.isEmpty() )
{
// We are golden : let's apply the schema in the real registries
- registries.setRelaxed();
-
- // Load the schemas
- for ( Schema schema : schemas )
- {
- loadDepsFirst( registries, schema );
- }
-
- // Build the cross references
- errors = registries.buildReferences();
+ registries = clonedRegistries;
registries.setStrict();
-
loaded = true;
}
}
-
- // clear the cloned registries
- clonedRegistries.clear();
+ else
+ {
+ // clear the cloned registries
+ clonedRegistries.clear();
+ }
return loaded;
}