directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r807599 - /directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/DescriptionParsers.java
Date Tue, 25 Aug 2009 12:55:27 GMT
Author: elecharny
Date: Tue Aug 25 12:55:26 2009
New Revision: 807599

URL: http://svn.apache.org/viewvc?rev=807599&view=rev
Log:
Foxed some unreachable imports, plus other compilation errors

Modified:
    directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/DescriptionParsers.java

Modified: directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/DescriptionParsers.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/DescriptionParsers.java?rev=807599&r1=807598&r2=807599&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/DescriptionParsers.java
(original)
+++ directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/schema/DescriptionParsers.java
Tue Aug 25 12:55:26 2009
@@ -48,12 +48,9 @@
 import org.apache.directory.shared.ldap.schema.parsers.LdapComparatorDescriptionSchemaParser;
 import org.apache.directory.shared.ldap.schema.parsers.DITContentRuleDescription;
 import org.apache.directory.shared.ldap.schema.parsers.DITContentRuleDescriptionSchemaParser;
-import org.apache.directory.shared.ldap.schema.parsers.DITStructureRuleDescription;
 import org.apache.directory.shared.ldap.schema.parsers.DITStructureRuleDescriptionSchemaParser;
 import org.apache.directory.shared.ldap.schema.parsers.LdapSyntaxDescriptionSchemaParser;
-import org.apache.directory.shared.ldap.schema.parsers.MatchingRuleDescription;
 import org.apache.directory.shared.ldap.schema.parsers.MatchingRuleDescriptionSchemaParser;
-import org.apache.directory.shared.ldap.schema.parsers.MatchingRuleUseDescription;
 import org.apache.directory.shared.ldap.schema.parsers.MatchingRuleUseDescriptionSchemaParser;
 import org.apache.directory.shared.ldap.schema.parsers.NameFormDescriptionSchemaParser;
 import org.apache.directory.shared.ldap.schema.parsers.NormalizerDescription;
@@ -77,7 +74,6 @@
 {
     private static final String OTHER_SCHEMA = "other";
     private static final String[] EMPTY = new String[0];
-    private static final Integer[] EMPTY_INT_ARRAY = new Integer[0];
 
     private static final LdapComparatorDescription[] EMPTY_COMPARATORS = new LdapComparatorDescription[0];
     private static final NormalizerDescription[] EMPTY_NORMALIZERS = new NormalizerDescription[0];
@@ -595,10 +591,11 @@
                 throw iave;
             }
             
-            if ( ! dao.hasSyntax( matchingRule.getSyntax() )  )
+            if ( ! dao.hasSyntax( matchingRule.getSyntaxOid() )  )
             {
                 throw new LdapOperationNotSupportedException(
-                    "Cannot create a matchingRule that depends on non-existant syntax: "
+ desc.getSyntax(),
+                    "Cannot create a matchingRule that depends on non-existant syntax: "
+ 
+                    matchingRule.getSyntaxOid(),
                     ResultCodeEnum.UNWILLING_TO_PERFORM );
             }
             



Mime
View raw message