You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2007/06/11 14:20:54 UTC

svn commit: r546119 - /directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java

Author: elecharny
Date: Mon Jun 11 05:20:53 2007
New Revision: 546119

URL: http://svn.apache.org/viewvc?view=rev&rev=546119
Log:
Added some fixes when the attribute 'objectClass' is null in modify operation

Modified:
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java?view=diff&rev=546119&r1=546118&r2=546119
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java Mon Jun 11 05:20:53 2007
@@ -1000,7 +1000,7 @@
         }
         else if ( existing == null )
         {
-            return new AttributeImpl( SchemaConstants.OBJECT_CLASSES_AT );
+            return new AttributeImpl( SchemaConstants.OBJECT_CLASS_AT );
         }
 
         switch ( modOp )
@@ -1308,6 +1308,11 @@
         if ( objectClassMod == null )
         {
             objectClass = entry.get( SchemaConstants.OBJECT_CLASS_AT );
+
+            if ( objectClass == null )
+            {
+                objectClass = new AttributeImpl( SchemaConstants.OBJECT_CLASS_AT );
+            }
         }
         else
         {