directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1483740 - /directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/SchemaPartition.java
Date Fri, 17 May 2013 11:13:53 GMT
Author: elecharny
Date: Fri May 17 11:13:53 2013
New Revision: 1483740

URL: http://svn.apache.org/r1483740
Log:
Changed the thrown exception when we try to delete an entry which has some children

Modified:
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/SchemaPartition.java

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/SchemaPartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/SchemaPartition.java?rev=1483740&r1=1483739&r2=1483740&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/SchemaPartition.java
(original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/SchemaPartition.java
Fri May 17 11:13:53 2013
@@ -29,9 +29,9 @@ import org.apache.directory.api.ldap.mod
 import org.apache.directory.api.ldap.model.entry.Entry;
 import org.apache.directory.api.ldap.model.entry.Modification;
 import org.apache.directory.api.ldap.model.entry.ModificationOperation;
+import org.apache.directory.api.ldap.model.exception.LdapContextNotEmptyException;
 import org.apache.directory.api.ldap.model.exception.LdapException;
 import org.apache.directory.api.ldap.model.exception.LdapInvalidDnException;
-import org.apache.directory.api.ldap.model.exception.LdapUnwillingToPerformException;
 import org.apache.directory.api.ldap.model.filter.ExprNode;
 import org.apache.directory.api.ldap.model.filter.PresenceNode;
 import org.apache.directory.api.ldap.model.message.SearchRequest;
@@ -309,7 +309,7 @@ public final class SchemaPartition exten
             {
                 nbEntry++;
             }
-            
+
             cursor.close();
 
             return nbEntry;
@@ -334,7 +334,7 @@ public final class SchemaPartition exten
 
         if ( nbChild > 1 )
         {
-            throw new LdapUnwillingToPerformException( "There are children under the entry
" + deleteContext.getDn() );
+            throw new LdapContextNotEmptyException( "There are children under the entry "
+ deleteContext.getDn() );
         }
 
         // The SchemaObject always exist when we reach this method.
@@ -352,7 +352,7 @@ public final class SchemaPartition exten
         }
 
         updateSchemaModificationAttributes( deleteContext );
-        
+
         return deletedEntry;
     }
 



Mime
View raw message