Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 70783 invoked from network); 17 Dec 2009 21:49:59 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 17 Dec 2009 21:49:59 -0000 Received: (qmail 90479 invoked by uid 500); 17 Dec 2009 21:49:59 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 90416 invoked by uid 500); 17 Dec 2009 21:49:58 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 90407 invoked by uid 99); 17 Dec 2009 21:49:58 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 17 Dec 2009 21:49:58 +0000 X-ASF-Spam-Status: No, hits=-3.8 required=5.0 tests=AWL,BAYES_00 X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 17 Dec 2009 21:49:56 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id CBAEE2388A60; Thu, 17 Dec 2009 21:49:35 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091217214935.CBAEE2388A60@eris.apache.org> 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 errors = new ArrayList(); - 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 ); }