directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r572196 - /directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java
Date Mon, 03 Sep 2007 00:01:16 GMT
Author: elecharny
Date: Sun Sep  2 17:01:15 2007
New Revision: 572196

URL: http://svn.apache.org/viewvc?rev=572196&view=rev
Log:
Fix for DIRSERVER-1055

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

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java?rev=572196&r1=572195&r2=572196&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java
Sun Sep  2 17:01:15 2007
@@ -797,17 +797,17 @@
         
         int minSetSize = 0;
         
-        if ( setOids.contains( "+" ) )
+        if ( setOids.contains( SchemaConstants.ALL_OPERATIONAL_ATTRIBUTES ) )
         {
             minSetSize++;
         }
         
-        if ( setOids.contains( "*" ) )
+        if ( setOids.contains( SchemaConstants.ALL_USER_ATTRIBUTES ) )
         {
             minSetSize++;
         }
         
-        if ( setOids.contains( SchemaConstants.REF_AT ) )
+        if ( setOids.contains( SchemaConstants.REF_AT_OID ) )
         {
             minSetSize++;
         }
@@ -842,7 +842,7 @@
 
         Attributes modificationAttributes = nexus.lookup( new LookupOperationContext( schemaModificationAttributesDN
) );
         
-        if ( returnAllOperationalAttributes || setOids.contains( SchemaConstants.CREATE_TIMESTAMP_AT
) )
+        if ( returnAllOperationalAttributes || setOids.contains( SchemaConstants.CREATE_TIMESTAMP_AT_OID
) )
         {
             attr = new AttributeImpl( SchemaConstants.CREATE_TIMESTAMP_AT );
             AttributeType createTimestampAT = registries.
@@ -852,14 +852,14 @@
             attrs.put( attr );
         }
 
-        if ( returnAllOperationalAttributes || setOids.contains( SchemaConstants.CREATORS_NAME_AT
) )
+        if ( returnAllOperationalAttributes || setOids.contains( SchemaConstants.CREATORS_NAME_AT_OID
) )
         {
             attr = new AttributeImpl( SchemaConstants.CREATORS_NAME_AT );
             attr.add( PartitionNexus.ADMIN_PRINCIPAL );
             attrs.put( attr );
         }
         
-        if ( returnAllOperationalAttributes || setOids.contains( SchemaConstants.MODIFY_TIMESTAMP_AT
) )
+        if ( returnAllOperationalAttributes || setOids.contains( SchemaConstants.MODIFY_TIMESTAMP_AT_OID
) )
         {
             attr = new AttributeImpl( SchemaConstants.MODIFY_TIMESTAMP_AT );
             AttributeType schemaModifyTimestampAT = registries.
@@ -870,7 +870,7 @@
             attrs.put( attr );
         }
 
-        if ( returnAllOperationalAttributes || setOids.contains( SchemaConstants.MODIFIERS_NAME_AT
) )
+        if ( returnAllOperationalAttributes || setOids.contains( SchemaConstants.MODIFIERS_NAME_AT_OID
) )
         {
             attr = new AttributeImpl( SchemaConstants.MODIFIERS_NAME_AT );
             AttributeType schemaModifiersNameAT = registries.



Mime
View raw message