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 2016/02/09 10:13:52 UTC
svn commit: r1729334 - in
/directory/apacheds/trunk/interceptors/schema/src/main/java/org/apache/directory/server/core/schema:
SchemaInterceptor.java SchemaSubentryManager.java
Author: elecharny
Date: Tue Feb 9 09:13:52 2016
New Revision: 1729334
URL: http://svn.apache.org/viewvc?rev=1729334&view=rev
Log:
We don't need to pass the SchemaLoader as a parameter, it's not used at all
Modified:
directory/apacheds/trunk/interceptors/schema/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java
directory/apacheds/trunk/interceptors/schema/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryManager.java
Modified: directory/apacheds/trunk/interceptors/schema/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/schema/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java?rev=1729334&r1=1729333&r2=1729334&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptors/schema/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java (original)
+++ directory/apacheds/trunk/interceptors/schema/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java Tue Feb 9 09:13:52 2016
@@ -69,7 +69,6 @@ import org.apache.directory.api.ldap.mod
import org.apache.directory.api.ldap.model.schema.SyntaxChecker;
import org.apache.directory.api.ldap.model.schema.UsageEnum;
import org.apache.directory.api.ldap.model.schema.registries.Schema;
-import org.apache.directory.api.ldap.model.schema.registries.SchemaLoader;
import org.apache.directory.api.ldap.model.schema.syntaxCheckers.OctetStringSyntaxChecker;
import org.apache.directory.api.util.Strings;
import org.apache.directory.server.core.api.DirectoryService;
@@ -186,8 +185,7 @@ public class SchemaInterceptor extends B
computeSuperiors();
// Initialize the schema manager
- SchemaLoader loader = directoryService.getSchemaManager().getLoader();
- schemaSubEntryManager = new SchemaSubentryManager( schemaManager, loader, dnFactory );
+ schemaSubEntryManager = new SchemaSubentryManager( schemaManager, dnFactory );
if ( IS_DEBUG )
{
Modified: directory/apacheds/trunk/interceptors/schema/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryManager.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/schema/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryManager.java?rev=1729334&r1=1729333&r2=1729334&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptors/schema/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryManager.java (original)
+++ directory/apacheds/trunk/interceptors/schema/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryManager.java Tue Feb 9 09:13:52 2016
@@ -44,7 +44,6 @@ import org.apache.directory.api.ldap.mod
import org.apache.directory.api.ldap.model.schema.parsers.LdapComparatorDescription;
import org.apache.directory.api.ldap.model.schema.parsers.NormalizerDescription;
import org.apache.directory.api.ldap.model.schema.parsers.SyntaxCheckerDescription;
-import org.apache.directory.api.ldap.model.schema.registries.SchemaLoader;
import org.apache.directory.api.util.Strings;
import org.apache.directory.server.core.api.DirectoryService;
import org.apache.directory.server.core.api.DnFactory;
@@ -114,7 +113,7 @@ public class SchemaSubentryManager
}
- public SchemaSubentryManager( SchemaManager schemaManager, SchemaLoader loader, DnFactory dnFactory )
+ public SchemaSubentryManager( SchemaManager schemaManager, DnFactory dnFactory )
throws LdapException
{
this.schemaManager = schemaManager;