directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r891933 - /directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/AttributeTypeSynchronizer.java
Date Thu, 17 Dec 2009 21:49:35 GMT
Author: elecharny
Date: Thu Dec 17 21:49:35 2009
New Revision: 891933

URL: http://svn.apache.org/viewvc?rev=891933&view=rev
Log:
Some cleanup (error message weren't propagated correctly)

Modified:
    directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/AttributeTypeSynchronizer.java

Modified: directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/AttributeTypeSynchronizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/AttributeTypeSynchronizer.java?rev=891933&r1=891932&r2=891933&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/AttributeTypeSynchronizer.java
(original)
+++ directory/apacheds/branches/apacheds-schema/core-api/src/main/java/org/apache/directory/server/core/schema/registries/synchronizers/AttributeTypeSynchronizer.java
Thu Dec 17 21:49:35 2009
@@ -20,9 +20,6 @@
 package org.apache.directory.server.core.schema.registries.synchronizers;
 
 
-import java.util.ArrayList;
-import java.util.List;
-
 import org.apache.directory.server.core.entry.ServerEntry;
 import org.apache.directory.server.core.interceptor.context.ModifyOperationContext;
 import org.apache.directory.shared.ldap.constants.MetaSchemaConstants;
@@ -172,8 +169,6 @@
         // Test that the Oid exists
         AttributeType attributeType = ( AttributeType ) checkOidExists( entry );
 
-        List<Throwable> errors = new ArrayList<Throwable>();
-
         if ( schema.isEnabled() && attributeType.isEnabled() )
         {
             if ( schemaManager.delete( attributeType ) )
@@ -183,8 +178,9 @@
             else
             {
                 // We have some error : reject the deletion and get out
-                String msg = "Cannot delete the AttributeType " + entry.getDn().getUpName()
+ " into the registries, "
-                    + "the resulting registries would be inconsistent :" + StringTools.listToString(
errors );
+                String msg = "Cannot delete the AttributeType " + entry.getDn().getUpName()
+ " from the registries, "
+                    + "the resulting registries would be inconsistent :" + 
+                    StringTools.listToString( schemaManager.getErrors() );
                 LOG.info( msg );
                 throw new LdapOperationNotSupportedException( msg, ResultCodeEnum.UNWILLING_TO_PERFORM
);
             }



Mime
View raw message