directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kayyag...@apache.org
Subject svn commit: r923861 - /directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapConnection.java
Date Tue, 16 Mar 2010 16:46:06 GMT
Author: kayyagari
Date: Tue Mar 16 16:46:06 2010
New Revision: 923861

URL: http://svn.apache.org/viewvc?rev=923861&view=rev
Log:
replaced jndi exception

Modified:
    directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapConnection.java

Modified: directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapConnection.java
URL: http://svn.apache.org/viewvc/directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapConnection.java?rev=923861&r1=923860&r2=923861&view=diff
==============================================================================
--- directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapConnection.java
(original)
+++ directory/clients/ldap/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapConnection.java
Tue Mar 16 16:46:06 2010
@@ -36,7 +36,6 @@ import java.util.concurrent.TimeoutExcep
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import javax.naming.InvalidNameException;
 import javax.net.ssl.SSLContext;
 
 import org.apache.directory.ldap.client.api.exception.InvalidConnectionException;
@@ -118,6 +117,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.entry.ModificationOperation;
 import org.apache.directory.shared.ldap.entry.Value;
+import org.apache.directory.shared.ldap.exception.LdapInvalidDnException;
 import org.apache.directory.shared.ldap.filter.ExprNode;
 import org.apache.directory.shared.ldap.filter.FilterParser;
 import org.apache.directory.shared.ldap.filter.SearchScope;
@@ -1184,7 +1184,7 @@ public class LdapConnection extends IoHa
             DN dn = new DN( searchRequest.getBaseDn() );
             request.setBaseObject( dn );
         }
-        catch ( InvalidNameException ine )
+        catch ( LdapInvalidDnException ine )
         {
             String msg = "The given dn '" + searchRequest.getBaseDn() + "' is not valid";
             LOG.error( msg );
@@ -1273,7 +1273,7 @@ public class LdapConnection extends IoHa
             DN dn = new DN( bindRequest.getName() );
             bindRequestCodec.setName( dn );
         }
-        catch ( InvalidNameException ine )
+        catch ( LdapInvalidDnException ine )
         {
             String msg = "The given dn '" + bindRequest.getName() + "' is not valid";
             LOG.error( msg );
@@ -2149,7 +2149,7 @@ public class LdapConnection extends IoHa
         {
             return rename( new DN( entryDn ), new RDN( newRdn ), deleteOldRdn );
         }
-        catch ( InvalidNameException e )
+        catch ( LdapInvalidDnException e )
         {
             LOG.error( e.getMessage(), e );
             throw new LdapException( e.getMessage(), e );
@@ -2188,7 +2188,7 @@ public class LdapConnection extends IoHa
         {
             return move( new DN( entryDn ), new DN( newSuperiorDn ) );
         }
-        catch ( InvalidNameException e )
+        catch ( LdapInvalidDnException e )
         {
             LOG.error( e.getMessage(), e );
             throw new LdapException( e.getMessage(), e );
@@ -2362,7 +2362,7 @@ public class LdapConnection extends IoHa
 
             return delete( deleteRequest );
         }
-        catch ( InvalidNameException e )
+        catch ( LdapInvalidDnException e )
         {
             LOG.error( e.getMessage(), e );
             throw new LdapException( e.getMessage(), e );
@@ -2439,7 +2439,7 @@ public class LdapConnection extends IoHa
                 throw new LdapException( msg );
             }
         }
-        catch ( InvalidNameException e )
+        catch ( LdapInvalidDnException e )
         {
             LOG.error( e.getMessage(), e );
             throw new LdapException( e.getMessage(), e );



Mime
View raw message