directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r1331401 - /directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/DirectoryApiConnectionWrapper.java
Date Fri, 27 Apr 2012 12:55:21 GMT
Author: pamarcelot
Date: Fri Apr 27 12:55:21 2012
New Revision: 1331401

URL: http://svn.apache.org/viewvc?rev=1331401&view=rev
Log:
Fix for DIRSTUDIO-808 ("Update existing entries" checkbox in "LDIF Import" wizard fails to
work with the Apache Directory LDAP API).
Added comments.

Modified:
    directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/DirectoryApiConnectionWrapper.java

Modified: directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/DirectoryApiConnectionWrapper.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/DirectoryApiConnectionWrapper.java?rev=1331401&r1=1331400&r2=1331401&view=diff
==============================================================================
--- directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/DirectoryApiConnectionWrapper.java
(original)
+++ directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/DirectoryApiConnectionWrapper.java
Fri Apr 27 12:55:21 2012
@@ -1251,11 +1251,14 @@ public class DirectoryApiConnectionWrapp
             LdapResult ldapResult = response.getLdapResult();
             if ( ldapResult != null )
             {
-                // NOT_ALLOWED_ON_NON_LEAF error (thrown when deleting a entry with children
+                // NOT_ALLOWED_ON_NON_LEAF error (thrown when deleting an entry with children)
                 if ( ResultCodeEnum.NOT_ALLOWED_ON_NON_LEAF.equals( ldapResult.getResultCode()
) )
                 {
                     throw new ContextNotEmptyException( ldapResult.getDiagnosticMessage()
);
                 }
+                // ENTRY_ALREADY_EXISTS error
+                // (We need this conversion in the case where this error is thrown during
an LDIF
+                // import with the "Update existing entries" flag turned on)
                 else if ( ResultCodeEnum.ENTRY_ALREADY_EXISTS.equals( ldapResult.getResultCode()
) )
                 {
                     throw new NameAlreadyBoundException( ldapResult.getDiagnosticMessage()
);



Mime
View raw message