svn commit: r1002517 - /directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/admin/AdministrativePointInterceptor.java

[el...@apache.org]

Author: elecharny
Date: Wed Sep 29 08:29:27 2010
New Revision: 1002517

URL: http://svn.apache.org/viewvc?rev=1002517&view=rev
Log:
Deleting an entry has no impact on the AP hierarchy, no need to do any extra check, as the deleted entry has no child

Modified:
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/admin/AdministrativePointInterceptor.java

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/admin/AdministrativePointInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/admin/AdministrativePointInterceptor.java?rev=1002517&r1=1002516&r2=1002517&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/admin/AdministrativePointInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/admin/AdministrativePointInterceptor.java Wed Sep 29 08:29:27 2010
@@ -1089,11 +1089,10 @@ public class AdministrativePointIntercep
         // Protect the AP caches against concurrent access
         lockWrite();
         
-        // Check that the removed AdministrativeRoles are valid
+        // Check that the removed AdministrativeRoles are valid. We don't have to do
+        // any other check, as the deleted entry has no children.
         for ( Value<?> role : adminPoint )
         {
-            checkDelRole( role, adminPoint, dn );
-
             if ( !isValidRole( role.getString() ) )
             {
                 String message = "Cannot remove the given role, it's not a valid one :" + role;
@@ -1102,8 +1101,7 @@ public class AdministrativePointIntercep
             }
         }
 
-        // Ok, we can remove the AP (no more check, as we can't delete an entry
-        // which has children
+        // Ok, we can remove the AP
         next.delete( deleteContext );
 
         // Now, update the AdminPoint cache