directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r1377704 - /directory/shared/trunk/ldap/model/src/main/antlr/subtree-specification.g
Date Mon, 27 Aug 2012 14:57:06 GMT
Author: pamarcelot
Date: Mon Aug 27 14:57:05 2012
New Revision: 1377704

URL: http://svn.apache.org/viewvc?rev=1377704&view=rev
Log:
Fix for DIRSHARED-136 (NPE in AntlrSubtreeSpecificationParser when initialized with an empty
schema manager) and DIRSTUDIO-829 (NPE when trying to add a 'subtreeSpecification' value)

Modified:
    directory/shared/trunk/ldap/model/src/main/antlr/subtree-specification.g

Modified: directory/shared/trunk/ldap/model/src/main/antlr/subtree-specification.g
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/antlr/subtree-specification.g?rev=1377704&r1=1377703&r2=1377704&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/antlr/subtree-specification.g (original)
+++ directory/shared/trunk/ldap/model/src/main/antlr/subtree-specification.g Mon Aug 27 14:57:05
2012
@@ -110,8 +110,11 @@ options
     public void init( SchemaManager schemaManager )
     {
         this.schemaManager = schemaManager;
-        OBJECT_CLASS_AT = schemaManager.getAttributeType( SchemaConstants.OBJECT_CLASS_AT
);
         
+        if ( schemaManager != null )
+        {
+            OBJECT_CLASS_AT = schemaManager.getAttributeType( SchemaConstants.OBJECT_CLASS_AT
);
+        }
     }
     
     



Mime
View raw message