directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r499772 - /directory/apacheds/branches/1.0/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java
Date Thu, 25 Jan 2007 12:54:24 GMT
Author: elecharny
Date: Thu Jan 25 04:54:23 2007
New Revision: 499772

URL: http://svn.apache.org/viewvc?view=rev&rev=499772
Log:
Used AttributeUtils.containsValueCaseIgnore( attr, value) instead of
attr.contains( value )

Modified:
    directory/apacheds/branches/1.0/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java

Modified: directory/apacheds/branches/1.0/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/1.0/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java?view=diff&rev=499772&r1=499771&r2=499772
==============================================================================
--- directory/apacheds/branches/1.0/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java
(original)
+++ directory/apacheds/branches/1.0/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java
Thu Jan 25 04:54:23 2007
@@ -1071,7 +1071,7 @@
             String id = ( String ) changes.next();
             Attribute change = mods.get( id );
 
-            if ( !atRegistry.hasAttributeType( change.getID() ) && !objectClass.contains(
"extensibleObject" ) )
+            if ( !atRegistry.hasAttributeType( change.getID() ) && !AttributeUtils.containsValueCaseIgnore(
objectClass, "extensibleObject" ) )
             {
                 throw new LdapInvalidAttributeIdentifierException( "unrecognized attributeID
" + change.getID() );
             }
@@ -1132,13 +1132,13 @@
                 switch ( modOp )
                 {
                     case ( DirContext.ADD_ATTRIBUTE  ):
-                        if ( ocMods.contains( "top" ) )
+                        if ( AttributeUtils.containsValueCaseIgnore( ocMods, "top" ) )
                         {
                             ocMods.remove( "top" );
                         }
                         for ( int ii = 0; ii < alteredObjectClass.size(); ii++ )
                         {
-                            if ( !objectClass.contains( alteredObjectClass.get( ii ) ) )
+                            if ( !AttributeUtils.containsValueCaseIgnore( objectClass, alteredObjectClass.get(
ii ) ) )
                             {
                                 ocMods.add( alteredObjectClass.get( ii ) );
                             }
@@ -1148,7 +1148,7 @@
                     case ( DirContext.REMOVE_ATTRIBUTE  ):
                         for ( int ii = 0; ii < alteredObjectClass.size(); ii++ )
                         {
-                            if ( !objectClass.contains( alteredObjectClass.get( ii ) ) )
+                            if ( !AttributeUtils.containsValueCaseIgnore( objectClass, alteredObjectClass.get(
ii ) ) )
                             {
                                 ocMods.remove( alteredObjectClass.get( ii ) );
                             }
@@ -1158,7 +1158,7 @@
                     case ( DirContext.REPLACE_ATTRIBUTE  ):
                         for ( int ii = 0; ii < alteredObjectClass.size(); ii++ )
                         {
-                            if ( !objectClass.contains( alteredObjectClass.get( ii ) ) )
+                            if ( !AttributeUtils.containsValueCaseIgnore( objectClass, alteredObjectClass.get(
ii ) ) )
                             {
                                 ocMods.add( alteredObjectClass.get( ii ) );
                             }
@@ -1267,7 +1267,7 @@
             int modOp = mods[ii].getModificationOp();
             Attribute change = mods[ii].getAttribute();
 
-            if ( !atRegistry.hasAttributeType( change.getID() ) && !objectClass.contains(
"extensibleObject" ) )
+            if ( !atRegistry.hasAttributeType( change.getID() ) && !AttributeUtils.containsValueCaseIgnore(
objectClass, "extensibleObject" ) )
             {
                 throw new LdapInvalidAttributeIdentifierException();
             }
@@ -1403,13 +1403,13 @@
                 switch ( objectClassMod.getModificationOp() )
                 {
                     case ( DirContext.ADD_ATTRIBUTE  ):
-                        if ( ocMods.contains( "top" ) )
+                        if ( AttributeUtils.containsValueCaseIgnore( ocMods, "top" ) )
                         {
                             ocMods.remove( "top" );
                         }
                         for ( int ii = 0; ii < alteredObjectClass.size(); ii++ )
                         {
-                            if ( !objectClass.contains( alteredObjectClass.get( ii ) ) )
+                            if ( !AttributeUtils.containsValueCaseIgnore( objectClass, alteredObjectClass.get(
ii ) ) )
                             {
                                 ocMods.add( alteredObjectClass.get( ii ) );
                             }
@@ -1418,7 +1418,7 @@
                     case ( DirContext.REMOVE_ATTRIBUTE  ):
                         for ( int ii = 0; ii < alteredObjectClass.size(); ii++ )
                         {
-                            if ( !objectClass.contains( alteredObjectClass.get( ii ) ) )
+                            if ( !AttributeUtils.containsValueCaseIgnore( objectClass, alteredObjectClass.get(
ii ) ) )
                             {
                                 ocMods.remove( alteredObjectClass.get( ii ) );
                             }
@@ -1427,7 +1427,7 @@
                     case ( DirContext.REPLACE_ATTRIBUTE  ):
                         for ( int ii = 0; ii < alteredObjectClass.size(); ii++ )
                         {
-                            if ( !objectClass.contains( alteredObjectClass.get( ii ) ) )
+                            if ( !AttributeUtils.containsValueCaseIgnore( objectClass, alteredObjectClass.get(
ii ) ) )
                             {
                                 ocMods.add( alteredObjectClass.get( ii ) );
                             }
@@ -1681,7 +1681,7 @@
         // declared for this entry
         Attribute objectClass = attributes.get( "objectclass" );
         
-        if ( objectClass.contains( "extensibleobject" ) )
+        if ( AttributeUtils.containsValueCaseIgnore( objectClass, "extensibleobject" ) )
         {
             return;
         }



Mime
View raw message