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 2010/03/16 17:00:23 UTC
svn commit: r923827 -
/directory/shared/trunk/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/ldif/extractor/impl/DefaultSchemaLdifExtractor.java
Author: elecharny
Date: Tue Mar 16 16:00:23 2010
New Revision: 923827
URL: http://svn.apache.org/viewvc?rev=923827&view=rev
Log:
Exceptions fixed
Modified:
directory/shared/trunk/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/ldif/extractor/impl/DefaultSchemaLdifExtractor.java
Modified: directory/shared/trunk/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/ldif/extractor/impl/DefaultSchemaLdifExtractor.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/ldif/extractor/impl/DefaultSchemaLdifExtractor.java?rev=923827&r1=923826&r2=923827&view=diff
==============================================================================
--- directory/shared/trunk/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/ldif/extractor/impl/DefaultSchemaLdifExtractor.java (original)
+++ directory/shared/trunk/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/ldif/extractor/impl/DefaultSchemaLdifExtractor.java Tue Mar 16 16:00:23 2010
@@ -35,10 +35,10 @@ import java.util.UUID;
import java.util.Map.Entry;
import java.util.regex.Pattern;
-import javax.naming.NamingException;
-
import org.apache.directory.shared.i18n.I18n;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
+import org.apache.directory.shared.ldap.exception.LdapException;
+import org.apache.directory.shared.ldap.ldif.LdapLdifException;
import org.apache.directory.shared.ldap.ldif.LdifEntry;
import org.apache.directory.shared.ldap.ldif.LdifReader;
import org.apache.directory.shared.ldap.schema.ldif.extractor.SchemaLdifExtractor;
@@ -234,7 +234,14 @@ public class DefaultSchemaLdifExtractor
out.write( ldifString );
out.flush();
}
- catch ( NamingException ne )
+ catch ( LdapLdifException ne )
+ {
+ // throw an exception : we should not have more than one entry per schema ldif file
+ String msg = I18n.err( I18n.ERR_08004, source, ne.getLocalizedMessage() );
+ LOG.error( msg );
+ throw new InvalidObjectException( msg );
+ }
+ catch ( LdapException ne )
{
// throw an exception : we should not have more than one entry per schema ldif file
String msg = I18n.err( I18n.ERR_08004, source, ne.getLocalizedMessage() );