You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2010/06/14 22:34:43 UTC
svn commit: r954634 - in
/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core:
authz/ changelog/ event/ subtree/ trigger/
Author: elecharny
Date: Mon Jun 14 20:34:42 2010
New Revision: 954634
URL: http://svn.apache.org/viewvc?rev=954634&view=rev
Log:
Replaced the lookup by the original entry
Modified:
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/EventInterceptor.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/TriggerInterceptor.java
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java?rev=954634&r1=954633&r2=954634&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authz/AciAuthorizationInterceptor.java Mon Jun 14 20:34:42 2010
@@ -834,7 +834,7 @@ public class AciAuthorizationInterceptor
DN oriChildName = moveAndRenameContext.getDn();
DN newParentName = moveAndRenameContext.getNewSuperiorDn();
- Entry entry = moveAndRenameContext.lookup( oriChildName, ByPassConstants.LOOKUP_BYPASS );
+ Entry entry = moveAndRenameContext.getOriginalEntry();
LdapPrincipal principal = moveAndRenameContext.getSession().getEffectivePrincipal();
DN principalDn = principal.getDN();
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java?rev=954634&r1=954633&r2=954634&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java Mon Jun 14 20:34:42 2010
@@ -330,7 +330,7 @@ public class ChangeLogInterceptor extend
if ( changeLog.isEnabled() && moveAndRenameContext.isFirstOperation() )
{
// @todo make sure we're not putting in operational attributes that cannot be user modified
- serverEntry = moveAndRenameContext.lookup( moveAndRenameContext.getDn(), ByPassConstants.LOOKUP_BYPASS );
+ serverEntry = moveAndRenameContext.getOriginalEntry();
}
next.moveAndRename( moveAndRenameContext );
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/EventInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/EventInterceptor.java?rev=954634&r1=954633&r2=954634&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/EventInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/event/EventInterceptor.java Mon Jun 14 20:34:42 2010
@@ -238,7 +238,7 @@ public class EventInterceptor extends Ba
public void moveAndRename( NextInterceptor next, final MoveAndRenameOperationContext moveAndRenameContext ) throws LdapException
{
- Entry oriEntry = moveAndRenameContext.lookup( moveAndRenameContext.getDn(), ByPassConstants.LOOKUP_BYPASS );
+ Entry oriEntry = moveAndRenameContext.getOriginalEntry();
List<RegistrationEntry> selecting = getSelectingRegistrations( moveAndRenameContext.getDn(), oriEntry );
next.moveAndRename( moveAndRenameContext );
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java?rev=954634&r1=954633&r2=954634&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java Mon Jun 14 20:34:42 2010
@@ -877,7 +877,7 @@ public class SubentryInterceptor extends
DN oriChildName = moveAndRenameContext.getDn();
DN parent = moveAndRenameContext.getNewSuperiorDn();
- Entry entry = moveAndRenameContext.lookup( oriChildName, ByPassConstants.LOOKUP_BYPASS );
+ Entry entry = moveAndRenameContext.getOriginalEntry();
EntryAttribute objectClasses = entry.get( objectClassType );
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/TriggerInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/TriggerInterceptor.java?rev=954634&r1=954633&r2=954634&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/TriggerInterceptor.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/trigger/TriggerInterceptor.java Mon Jun 14 20:34:42 2010
@@ -419,7 +419,7 @@ public class TriggerInterceptor extends
}
// Gather supplementary data.
- Entry movedEntry = moveAndRenameContext.lookup( oriChildName, ByPassConstants.LOOKUP_BYPASS );
+ Entry movedEntry = moveAndRenameContext.getOriginalEntry();
RDN oldRDN = oriChildName.getRdn();
DN oldSuperiorDN = ( DN ) oriChildName.clone();