directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r545227 - /directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/AttributeTypeImpl.java
Date Thu, 07 Jun 2007 16:10:56 GMT
Author: pamarcelot
Date: Thu Jun  7 09:10:55 2007
New Revision: 545227

URL: http://svn.apache.org/viewvc?view=rev&rev=545227
Log:
Fixed DIRSERVER-962 (getEquality(), getSubstr() and getOrdering() methods of the AttributeTypeImpl
class does not return any MatchingRule from a superior attribute type).

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?view=diff&rev=545227&r1=545226&r2=545227
==============================================================================
--- 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
Thu Jun  7 09:10:55 2007
@@ -87,12 +87,15 @@
             return null;
         }
         
-        if ( at.getEquality() == null )
+        MatchingRule mr = at.getEquality();
+        if ( mr == null )
         {
             return findEquality( at.getSuperior() );
         }
-        
-        return null;
+        else
+        {
+            return mr;
+        }
     }
 
 
@@ -124,12 +127,15 @@
             return null;
         }
         
-        if ( at.getOrdering() == null )
+        MatchingRule mr = at.getOrdering();
+        if ( mr == null )
         {
             return findOrdering( at.getSuperior() );
         }
-        
-        return null;
+        else
+        {
+            return mr;
+        }
     }
 
 
@@ -161,12 +167,15 @@
             return null;
         }
         
-        if ( at.getSubstr() == null )
+        MatchingRule mr = at.getSubstr();
+        if ( mr == null )
         {
             return findSubstr( at.getSuperior() );
         }
-        
-        return null;
+        else
+        {
+            return mr;
+        }
     }
 
 



Mime
View raw message