directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r810680 - /directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/SchemaPartition.java
Date Wed, 02 Sep 2009 19:38:59 GMT
Author: akarasulu
Date: Wed Sep  2 19:38:58 2009
New Revision: 810680

URL: http://svn.apache.org/viewvc?rev=810680&view=rev
Log:
skipping some code if NullPartition is used

Modified:
    directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/SchemaPartition.java

Modified: directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/SchemaPartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/SchemaPartition.java?rev=810680&r1=810679&r2=810680&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/SchemaPartition.java
(original)
+++ directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/SchemaPartition.java
Wed Sep  2 19:38:58 2009
@@ -20,13 +20,12 @@
 package org.apache.directory.server.core.schema;
 
 
-import java.util.HashSet;
+import java.util.HashSet; 
 import java.util.Map;
 import java.util.Set;
 
 import javax.naming.NamingException;
 
-import org.apache.directory.server.constants.CoreSchemaConstants;
 import org.apache.directory.server.constants.ServerDNConstants;
 import org.apache.directory.server.core.entry.ClonedServerEntry;
 import org.apache.directory.server.core.entry.ServerEntry;
@@ -47,9 +46,7 @@
 import org.apache.directory.server.core.partition.NullPartition;
 import org.apache.directory.server.core.partition.Partition;
 import org.apache.directory.server.core.partition.impl.btree.BTreePartition;
-import org.apache.directory.server.schema.bootstrap.CoreSchema;
 import org.apache.directory.server.xdbm.Index;
-import org.apache.directory.shared.ldap.constants.MetaSchemaConstants;
 import org.apache.directory.shared.ldap.message.control.CascadeControl;
 import org.apache.directory.shared.ldap.name.LdapDN;
 import org.apache.directory.shared.ldap.schema.AttributeType;
@@ -206,6 +203,13 @@
             SchemaPartitionDao dao = new SchemaPartitionDao( wrapped, registries );
             schemaManager = new SchemaOperationControl( registries, partitionLoader, dao
);
             
+            if ( wrapped instanceof NullPartition )
+            {
+                LOG.warn( "BYPASSING CRITICAL SCHEMA PROCESSING CODE DURING HEAVY DEV.  "
+
+                		"PLEASE REMOVE THIS CONDITION BY USING A VALID SCHEMA PARTITION!!!" );
+                return;
+            }
+            
             // --------------------------------------------------------------------
             // Make sure all schema with attributes that are indexed are enabled
             // --------------------------------------------------------------------



Mime
View raw message