Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 28923 invoked from network); 16 Aug 2007 21:31:15 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 16 Aug 2007 21:31:14 -0000 Received: (qmail 69557 invoked by uid 500); 16 Aug 2007 21:31:12 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 69515 invoked by uid 500); 16 Aug 2007 21:31:12 -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 69504 invoked by uid 99); 16 Aug 2007 21:31:12 -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:31:12 -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:31:32 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 175A31A981A; Thu, 16 Aug 2007 14:30:50 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r566863 - /directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java Date: Thu, 16 Aug 2007 21:30:50 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070816213050.175A31A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: elecharny Date: Thu Aug 16 14:30:49 2007 New Revision: 566863 URL: http://svn.apache.org/viewvc?view=rev&rev=566863 Log: Fixed potential pb related to DIRSERVER-832 Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java?view=diff&rev=566863&r1=566862&r2=566863 ============================================================================== --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java (original) +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java Thu Aug 16 14:30:49 2007 @@ -238,7 +238,7 @@ Comparator comparator = getComparator( node.getAttribute() ); // get the attribute associated with the node - AttributeType type = attributeTypeRegistry.lookup( oidRegistry.getOid( node.getAttribute() ) ); + AttributeType type = attributeTypeRegistry.lookup( node.getAttribute() ); Attribute attr = AttributeUtils.getAttribute( entry, type ); // If we do not have the attribute just return false @@ -248,7 +248,7 @@ } // check if AVA value exists in attribute - if ( attr.contains( node.getValue() ) ) + if ( AttributeUtils.containsValue( attr, node.getValue(), type ) ) { return true; } @@ -257,7 +257,7 @@ Object filterValue = normalizer.normalize( node.getValue() ); // check if the normalized value is present - if ( attr.contains( filterValue ) ) + if ( AttributeUtils.containsValue( attr, filterValue, type ) ) { return true; }