directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r531300 - /directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java
Date Sun, 22 Apr 2007 23:00:15 GMT
Author: elecharny
Date: Sun Apr 22 16:00:14 2007
New Revision: 531300

URL: http://svn.apache.org/viewvc?view=rev&rev=531300
Log:
Remove the ACI_ATTR constant to use the ldap_constants instead

Modified:
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java?view=diff&rev=531300&r1=531299&r2=531300
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/TupleCache.java
Sun Apr 22 16:00:14 2007
@@ -71,8 +71,6 @@
  */
 public class TupleCache
 {
-    /** the attribute id for prescriptive aci: prescriptiveACI */
-    private static final String ACI_ATTR = "prescriptiveACI";
     /** the object class for access control subentries: accessControlSubentry */
     private static final String ACSUBENTRY_OC = "accessControlSubentry";
 
@@ -140,10 +138,10 @@
             {
                 SearchResult result = ( SearchResult ) results.next();
                 String subentryDn = result.getName();
-                Attribute aci = result.getAttributes().get( ACI_ATTR );
+                Attribute aci = result.getAttributes().get( SchemaConstants.PRESCRIPTIVE_ACI_AT
);
                 if ( aci == null )
                 {
-                    log.warn( "Found accessControlSubentry '" + subentryDn + "' without any
" + ACI_ATTR );
+                    log.warn( "Found accessControlSubentry '" + subentryDn + "' without any
" + SchemaConstants.PRESCRIPTIVE_ACI_AT );
                     continue;
                 }
 
@@ -159,7 +157,7 @@
     private boolean hasPrescriptiveACI( Attributes entry ) throws NamingException
     {
         // only do something if the entry contains prescriptiveACI
-        Attribute aci = entry.get( ACI_ATTR );
+        Attribute aci = entry.get( SchemaConstants.PRESCRIPTIVE_ACI_AT );
 
         if ( aci == null )
         {
@@ -183,7 +181,7 @@
     public void subentryAdded( String upName, LdapDN normName, Attributes entry ) throws
NamingException
     {
         // only do something if the entry contains prescriptiveACI
-        Attribute aci = entry.get( ACI_ATTR );
+        Attribute aci = entry.get( SchemaConstants.PRESCRIPTIVE_ACI_AT );
         if ( !hasPrescriptiveACI( entry ) )
         {
             return;
@@ -240,7 +238,7 @@
         boolean isAciModified = false;
         for ( int ii = 0; ii < mods.length; ii++ )
         {
-            isAciModified |= AttributeUtils.containsValueCaseIgnore( mods[ii].getAttribute(),
ACI_ATTR );
+            isAciModified |= AttributeUtils.containsValueCaseIgnore( mods[ii].getAttribute(),
SchemaConstants.PRESCRIPTIVE_ACI_AT );
         }
         if ( isAciModified )
         {
@@ -257,7 +255,7 @@
             return;
         }
 
-        if ( mods.get( ACI_ATTR ) != null )
+        if ( mods.get( SchemaConstants.PRESCRIPTIVE_ACI_AT ) != null )
         {
             subentryDeleted( normName, entry );
             subentryAdded( normName.getUpName(), normName, entry );



Mime
View raw message