Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 26882 invoked from network); 7 Oct 2007 23:21:07 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 7 Oct 2007 23:21:07 -0000 Received: (qmail 5660 invoked by uid 500); 7 Oct 2007 23:20:55 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 5624 invoked by uid 500); 7 Oct 2007 23:20:55 -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 5613 invoked by uid 99); 7 Oct 2007 23:20:55 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 07 Oct 2007 16:20:55 -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; Sun, 07 Oct 2007 23:20:58 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id DB2A51A9832; Sun, 7 Oct 2007 16:20:37 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r582697 - /directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/AttributeTypeImpl.java Date: Sun, 07 Oct 2007 23:20:37 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071007232037.DB2A51A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: elecharny Date: Sun Oct 7 16:20:36 2007 New Revision: 582697 URL: http://svn.apache.org/viewvc?rev=582697&view=rev Log: Reverting my saturday's change which cause the integ tests to fail (was a change in the way MatchingRules are handled) Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/AttributeTypeImpl.java Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/AttributeTypeImpl.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/AttributeTypeImpl.java?rev=582697&r1=582696&r2=582697&view=diff ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/AttributeTypeImpl.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/AttributeTypeImpl.java Sun Oct 7 16:20:36 2007 @@ -147,19 +147,7 @@ { if ( substrOid == null ) { - MatchingRule matchingRule = findSubstr( getSuperior() ); - - if ( matchingRule == null ) - { - // We don't have a matching rule for this AT, - // let's return an error. - String message = "No matching rule defined for attribute " + (names != null ? names[0] : "" ) + "[" + oid + "]"; - throw new LdapInvalidAttributeValueException( message, ResultCodeEnum.INAPPROPRIATE_MATCHING ); - } - else - { - return matchingRule; - } + return findSubstr( getSuperior() ); } return registries.getMatchingRuleRegistry().lookup( substrOid );