directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1378846 - /directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/EqualityEvaluator.java
Date Thu, 30 Aug 2012 08:16:38 GMT
Author: elecharny
Date: Thu Aug 30 08:16:38 2012
New Revision: 1378846

URL: http://svn.apache.org/viewvc?rev=1378846&view=rev
Log:
Solve issue DIRSERVER-1748.

Modified:
    directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/EqualityEvaluator.java

Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/EqualityEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/EqualityEvaluator.java?rev=1378846&r1=1378845&r2=1378846&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/EqualityEvaluator.java
(original)
+++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/EqualityEvaluator.java
Thu Aug 30 08:16:38 2012
@@ -63,25 +63,19 @@ public class EqualityEvaluator<T> extend
         if ( db.hasIndexOn( attributeType ) )
         {
             idx = ( Index<T, Entry, String> ) db.getIndex( attributeType );
-            normalizer = null;
+        }
+
+        MatchingRule mr = attributeType.getEquality();
+
+        if ( mr == null )
+        {
+            normalizer = new NoOpNormalizer( attributeType.getOid() );
             ldapComparator = null;
         }
         else
         {
-            idx = null;
-
-            MatchingRule mr = attributeType.getEquality();
-
-            if ( mr == null )
-            {
-                normalizer = new NoOpNormalizer( attributeType.getOid() );
-                ldapComparator = null;
-            }
-            else
-            {
-                normalizer = mr.getNormalizer();
-                ldapComparator = mr.getLdapComparator();
-            }
+            normalizer = mr.getNormalizer();
+            ldapComparator = mr.getLdapComparator();
         }
     }
 



Mime
View raw message