You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2007/08/16 23:30:50 UTC

svn commit: r566863 - /directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/LeafEvaluator.java

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;
         }