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 2019/05/07 05:14:23 UTC
[directory-ldap-api] branch master updated: Fixed a merge error
This is an automated email from the ASF dual-hosted git repository.
elecharny pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/directory-ldap-api.git
The following commit(s) were added to refs/heads/master by this push:
new c787edb Fixed a merge error
c787edb is described below
commit c787edbaf6b12af28a530f27a6cb7f9c7530114a
Author: emmanuel lecharny <el...@apache.org>
AuthorDate: Tue May 7 07:14:19 2019 +0200
Fixed a merge error
---
.../ldap/schema/manager/impl/DefaultSchemaManager.java | 17 -----------------
1 file changed, 17 deletions(-)
diff --git a/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schema/manager/impl/DefaultSchemaManager.java b/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schema/manager/impl/DefaultSchemaManager.java
index 9da424a..b26b9e6 100644
--- a/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schema/manager/impl/DefaultSchemaManager.java
+++ b/ldap/schema/data/src/main/java/org/apache/directory/api/ldap/schema/manager/impl/DefaultSchemaManager.java
@@ -164,23 +164,6 @@ public class DefaultSchemaManager implements SchemaManager
}
}
-
- /*
- * Static helper factory Create LDIF based SchemaLoader
- */
- private static SchemaLoader jarLdifSchemaLoader()
- {
- try
- {
- return new JarLdifSchemaLoader();
- }
- catch ( LdapException | IOException e )
- {
- LOG.error( I18n.err( I18n.ERR_16080_SCHEMA_LOADER_CANT_BE_CREATED, e.getMessage() ) );
- throw new RuntimeException( e.getMessage() );
- }
- }
-
/**