directory-commits mailing list archives

Author: elecharny
Date: Fri Dec  4 17:52:07 2009
New Revision: 887297

URL: http://svn.apache.org/viewvc?rev=887297&view=rev
Log:
Fixed a NPE when trying to load a bad schema (schema that does not exist)

Modified:
    directory/shared/branches/shared-schema/ldap-schema-loader/src/main/java/org/apache/directory/shared/schema/DefaultSchemaManager.java

Modified: directory/shared/branches/shared-schema/ldap-schema-loader/src/main/java/org/apache/directory/shared/schema/DefaultSchemaManager.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap-schema-loader/src/main/java/org/apache/directory/shared/schema/DefaultSchemaManager.java?rev=887297&r1=887296&r2=887297&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/ldap-schema-loader/src/main/java/org/apache/directory/shared/schema/DefaultSchemaManager.java
(original)
+++ directory/shared/branches/shared-schema/ldap-schema-loader/src/main/java/org/apache/directory/shared/schema/DefaultSchemaManager.java
Fri Dec  4 17:52:07 2009
@@ -822,6 +822,12 @@
      */
     private final void loadDepsFirst( Registries registries, Schema schema ) throws Exception
     {
+        if ( schema == null )
+        {
+            LOG.info( "The schema is null" );
+            return;
+        }
+
         if ( schema.isDisabled() && !registries.isDisabledAccepted() )
         {
             LOG.info( "The schema is disabled and the registries does not accepted disabled
schema" );