directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r569663 - /directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java
Date Sat, 25 Aug 2007 13:40:20 GMT
Author: elecharny
Date: Sat Aug 25 06:40:19 2007
New Revision: 569663

URL: http://svn.apache.org/viewvc?rev=569663&view=rev
Log:
Removed the commented parts in the code, we don't take care of extensibleObject anymore.

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?rev=569663&r1=569662&r2=569663&view=diff
==============================================================================
--- 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
Sat Aug 25 06:40:19 2007
@@ -54,7 +54,6 @@
 import org.apache.directory.server.core.interceptor.context.ModifyOperationContext;
 import org.apache.directory.server.core.interceptor.context.MoveAndRenameOperationContext;
 import org.apache.directory.server.core.interceptor.context.MoveOperationContext;
-import org.apache.directory.server.core.interceptor.context.OperationContext;
 import org.apache.directory.server.core.interceptor.context.RenameOperationContext;
 import org.apache.directory.server.core.interceptor.context.SearchOperationContext;
 import org.apache.directory.server.core.invocation.Invocation;
@@ -1873,7 +1872,6 @@
     private void assertObjectClasses( List<ObjectClass> ocs )  throws LdapSchemaViolationException
     {
     	boolean hasStructural = false;
-    	boolean hasExtensibleObject = false;
     	
     	// Loop on all the entry objectClasses 
     	for ( ObjectClass oc:ocs )
@@ -1892,17 +1890,10 @@
     				hasStructural = true;
     			}
     		}
-    		
-    		if ( oc.getOid().equals( SchemaConstants.EXTENSIBLE_OBJECT_OC_OID ) )
-    		{
-    			hasExtensibleObject = true;
-    		}
     	}
     	
     	// Throw an error if no STRUCTURAL objectClass is found.
-    	// Right now, if the extensibleObject OC is present, we relax
-    	// the previous constraint to avoid failing tests.
-    	if ( !hasStructural && !hasExtensibleObject )
+    	if ( !hasStructural )
     	{
     		String message = "An entry must have at least one STRUCTURAL ObjectClass";
     		log.error( message );



Mime
View raw message