LDAP support for hierarchy unit. Code clean up.

[lgpl/argeo-commons.git] / org.argeo.util / src / org / argeo / osgi / useradmin / LdapConnection.java

diff --git a/org.argeo.util/src/org/argeo/osgi/useradmin/LdapConnection.java b/org.argeo.util/src/org/argeo/osgi/useradmin/LdapConnection.java
index ed69eb16b09443409757a9c6584a4909a5dcfc66..1eaf1e7d65470e8377e072727b0fb8069f375ebd 100644 (file)
--- a/org.argeo.util/src/org/argeo/osgi/useradmin/LdapConnection.java
+++ b/org.argeo.util/src/org/argeo/osgi/useradmin/LdapConnection.java
@@ -49,8 +49,8 @@ class LdapConnection {
                                        initialLdapContext.addToEnvironment(Context.SECURITY_CREDENTIALS, creds.toString());
                                }
                        }
-               } catch (Exception e) {
-                       throw new UserDirectoryException("Cannot connect to LDAP", e);
+               } catch (NamingException e) {
+                       throw new IllegalStateException("Cannot connect to LDAP", e);
                }
 
        }
@@ -105,17 +105,17 @@ class LdapConnection {
                // delete
                for (LdapName dn : wc.getDeletedUsers().keySet()) {
                        if (!entryExists(dn))
-                               throw new UserDirectoryException("User to delete no found " + dn);
+                               throw new IllegalStateException("User to delete no found " + dn);
                }
                // add
                for (LdapName dn : wc.getNewUsers().keySet()) {
                        if (entryExists(dn))
-                               throw new UserDirectoryException("User to create found " + dn);
+                               throw new IllegalStateException("User to create found " + dn);
                }
                // modify
                for (LdapName dn : wc.getModifiedUsers().keySet()) {
                        if (!wc.getNewUsers().containsKey(dn) && !entryExists(dn))
-                               throw new UserDirectoryException("User to modify not found " + dn);
+                               throw new IllegalStateException("User to modify not found " + dn);
                }
 
        }