directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r889953 - /directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/Registries.java
Date Sat, 12 Dec 2009 17:45:02 GMT
Author: elecharny
Date: Sat Dec 12 17:45:02 2009
New Revision: 889953

URL: http://svn.apache.org/viewvc?rev=889953&view=rev
Log:
Fixed a error message

Modified:
    directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/Registries.java

Modified: directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/Registries.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/Registries.java?rev=889953&r1=889952&r2=889953&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/Registries.java
(original)
+++ directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/Registries.java
Sat Dec 12 17:45:02 2009
@@ -1224,7 +1224,7 @@
             // processed yet.
             if ( superior != null )
             {
-                if ( !processed.contains( superiorOid ) )
+                if ( !processed.contains( superior.getOid() ) )
                 {
                     resolveRecursive( superior, processed, errors );
                     processed.add( objectClass.getOid() );
@@ -1232,9 +1232,10 @@
                 else
                 {
                     // Not allowed : we have a cyle
-                    Throwable error = new LdapSchemaViolationException( "The AttributeType
" + objectClass.getOid()
+                    Throwable error = new LdapSchemaViolationException( "The ObjectClass
" + objectClass.getOid()
                         + " can't have itself as a superior, or"
-                        + " a cycle has been detected while processing the superior's tree",
+                        + " a cycle has been detected while processing the superior's tree,"
+                        + " or this superior has already been added : \n" + superior,
                         ResultCodeEnum.INVALID_ATTRIBUTE_SYNTAX );
                     errors.add( error );
                     return;



Mime
View raw message