Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 28438 invoked from network); 16 Aug 2007 21:29:43 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 16 Aug 2007 21:29:43 -0000 Received: (qmail 66281 invoked by uid 500); 16 Aug 2007 21:29:31 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 66247 invoked by uid 500); 16 Aug 2007 21:29:31 -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 66233 invoked by uid 99); 16 Aug 2007 21:29:31 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 Aug 2007 14:29:31 -0700 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 Aug 2007 21:29:53 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 3F9CC1A981A; Thu, 16 Aug 2007 14:29:11 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r566862 - /directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/exception/ExceptionService.java Date: Thu, 16 Aug 2007 21:29:11 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070816212911.3F9CC1A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: elecharny Date: Thu Aug 16 14:29:10 2007 New Revision: 566862 URL: http://svn.apache.org/viewvc?view=rev&rev=566862 Log: Fixed a potential error related to DIRSERVER-832, and add a TODO Fix DIRSERVER-832 in another place Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/exception/ExceptionService.java Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/exception/ExceptionService.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/exception/ExceptionService.java?view=diff&rev=566862&r1=566861&r2=566862 ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/exception/ExceptionService.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/exception/ExceptionService.java Thu Aug 16 14:29:10 2007 @@ -59,6 +59,7 @@ import org.apache.directory.shared.ldap.message.ResultCodeEnum; import org.apache.directory.shared.ldap.name.LdapDN; import org.apache.directory.shared.ldap.schema.OidNormalizer; +import org.apache.directory.shared.ldap.util.AttributeUtils; import org.apache.directory.shared.ldap.util.EmptyEnumeration; @@ -182,7 +183,7 @@ Attribute objectClass = attrs.get( SchemaConstants.OBJECT_CLASS_AT ); - if ( objectClass.contains( SchemaConstants.ALIAS_OC ) ) + if ( AttributeUtils.containsValueCaseIgnore( objectClass, SchemaConstants.ALIAS_OC ) ) { String msg = "Attempt to add entry to alias '" + name.getUpName() + "' not allowed."; ResultCodeEnum rc = ResultCodeEnum.ALIAS_PROBLEM; @@ -327,6 +328,7 @@ { for ( int jj = 0; jj < modAttr.size(); jj++ ) { + // TODO Fix DIRSERVER-832 if ( entryAttr.contains( modAttr.get( jj ) ) ) { throw new LdapAttributeInUseException( "Trying to add existing value '" + modAttr.get( jj )