You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ak...@apache.org on 2008/05/24 02:34:45 UTC
svn commit: r659728 - in /directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core: authz/AciAuthorizationInterceptor.java partition/impl/btree/BTreePartition.java

Author: akarasulu
Date: Fri May 23 17:34:43 2008
New Revision: 659728

URL: http://svn.apache.org/viewvc?rev=659728&view=rev
Log:
using proper original entry of cloned entry

Modified:
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java
    directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java

Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java?rev=659728&r1=659727&r2=659728&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java Fri May 23 17:34:43 2008
@@ -674,7 +674,7 @@
         Invocation invocation = InvocationStack.getInstance().peek();
         PartitionNexusProxy proxy = invocation.getProxy();
         
-        ServerEntry entry = proxy.lookup( new LookupOperationContext( registries, name ), PartitionNexusProxy.LOOKUP_BYPASS );
+        ClonedServerEntry entry = proxy.lookup( new LookupOperationContext( registries, name ), PartitionNexusProxy.LOOKUP_BYPASS );
             
         
         LdapPrincipal principal = ( ( ServerContext ) invocation.getCaller() ).getPrincipal();
@@ -688,13 +688,13 @@
 
         Set<LdapDN> userGroups = groupCache.getGroups( principalDn.toNormName() );
         Collection<ACITuple> tuples = new HashSet<ACITuple>();
-        addPerscriptiveAciTuples( proxy, tuples, name, entry );
-        addEntryAciTuples( tuples, entry );
-        addSubentryAciTuples( proxy, tuples, name, entry );
+        addPerscriptiveAciTuples( proxy, tuples, name, entry.getOriginalEntry() );
+        addEntryAciTuples( tuples, entry.getOriginalEntry() );
+        addSubentryAciTuples( proxy, tuples, name, entry.getOriginalEntry() );
 
         // check that we have browse access to the entry
         engine.checkPermission( registries, proxy, userGroups, principalDn, principal.getAuthenticationLevel(), name, null, null,
-            BROWSE_PERMS, tuples, entry, null );
+            BROWSE_PERMS, tuples, entry.getOriginalEntry(), null );
 
         return next.hasEntry( entryContext );
     }

Modified: directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java?rev=659728&r1=659727&r2=659728&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java (original)
+++ directory/apacheds/branches/bigbang/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java Fri May 23 17:34:43 2008
@@ -293,7 +293,7 @@
             return entry;
         }
 
-        for ( AttributeType attributeType : entry.getAttributeTypes() )
+        for ( AttributeType attributeType : entry.getOriginalEntry().getAttributeTypes() )
         {
             if ( ! opContext.getAttrsId().contains( attributeType.getOid() ) )
             {