You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ak...@apache.org on 2006/12/29 18:00:14 UTC
svn commit: r491047 - in /directory/branches/trunks/schema/apacheds: bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/ core/src/main/java/org/apache/directory/server/core/schema/ schema-registries/src/main/java/org/apach...

Author: akarasulu
Date: Fri Dec 29 09:00:13 2006
New Revision: 491047

URL: http://svn.apache.org/viewvc?view=rev&rev=491047
Log:
Fixed a few NPE based bugs and other issues where objectClass names was 
improperly overwritten.  Fixed issues with processing schema loading when 
syntaxes don't have names.

Modified:
    directory/branches/trunks/schema/apacheds/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/AttributesFactory.java
    directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/schema/ObjectClassImpl.java
    directory/branches/trunks/schema/apacheds/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultSyntaxRegistry.java

Modified: directory/branches/trunks/schema/apacheds/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/AttributesFactory.java
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/AttributesFactory.java?view=diff&rev=491047&r1=491046&r2=491047
==============================================================================
--- directory/branches/trunks/schema/apacheds/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/AttributesFactory.java (original)
+++ directory/branches/trunks/schema/apacheds/bootstrap-plugin/src/main/java/org/apache/directory/server/core/bootstrap/plugin/AttributesFactory.java Fri Dec 29 09:00:13 2006
@@ -199,11 +199,7 @@
         injectCommon( attributeType, entry );
         
         AttributeType superior = attributeType.getSuperior();
-        if ( superior == null )
-        {
-            entry.put( MetaSchemaConstants.M_SUP_ATTRIBUTE_TYPE_AT, "top" );
-        }
-        else
+        if ( superior != null )
         {
             // use name if we can for clarity
             String sup = superior.getName();

Modified: directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/schema/ObjectClassImpl.java
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/schema/ObjectClassImpl.java?view=diff&rev=491047&r1=491046&r2=491047
==============================================================================
--- directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/schema/ObjectClassImpl.java (original)
+++ directory/branches/trunks/schema/apacheds/core/src/main/java/org/apache/directory/server/core/schema/ObjectClassImpl.java Fri Dec 29 09:00:13 2006
@@ -67,7 +67,7 @@
     }
 
 
-    public void setNames( String[] name )
+    public void setNames( String[] names )
     {
         super.setNames( names );
     }

Modified: directory/branches/trunks/schema/apacheds/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultSyntaxRegistry.java
URL: http://svn.apache.org/viewvc/directory/branches/trunks/schema/apacheds/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultSyntaxRegistry.java?view=diff&rev=491047&r1=491046&r2=491047
==============================================================================
--- directory/branches/trunks/schema/apacheds/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultSyntaxRegistry.java (original)
+++ directory/branches/trunks/schema/apacheds/schema-registries/src/main/java/org/apache/directory/server/schema/registries/DefaultSyntaxRegistry.java Fri Dec 29 09:00:13 2006
@@ -98,7 +98,11 @@
             throw e;
         }
 
-        oidRegistry.register( syntax.getName(), syntax.getOid() );
+        if ( syntax.getName() != null )
+        {
+            oidRegistry.register( syntax.getName(), syntax.getOid() );
+        }
+
         byOid.put( syntax.getOid(), syntax );
         oidToSchema.put( syntax.getOid(), schema );
         if ( log.isDebugEnabled() )