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/10/08 01:20:37 UTC
svn commit: r582697 -
/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/AttributeTypeImpl.java
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 );