| commit | 2b7826708099a4fc44305b9c5a9edc75f69b9c84 | [log] [tgz] |
|---|---|---|
| author | Emmanuel Lécharny <elecharny@apache.org> | Tue May 07 06:51:50 2019 +0200 |
| committer | GitHub <noreply@github.com> | Tue May 07 06:51:50 2019 +0200 |
| tree | 7ddf1935ac42ed71ffef853c5659798756b79778 | |
| parent | 79b27a2fdccc0de8a54625c9de7f8293c3fc04bd [diff] | |
| parent | 359f0800ef755490edb8f1d81fa2a78a36c3ba5d [diff] |
Merge branch 'master' into DIRAPI-341
diff --git a/.gitignore b/.gitignore index d3c4e64..da87ed5 100644 --- a/.gitignore +++ b/.gitignore
@@ -13,4 +13,5 @@ bin dependency-reduced-pom.xml META-INF - +# intellij idea folder +.idea
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 4d72542..9da424a 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
@@ -147,6 +147,23 @@ } } + /* + Static helper factory Create LDIF based SchemaLoader + needed to handle checked exceptions + */ + 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() ); + } + } + /* * Static helper factory Create LDIF based SchemaLoader