directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r946817 - in /directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core: subtree/SubentryInterceptor.java trigger/TriggerInterceptor.java
Date Thu, 20 May 2010 23:13:04 GMT
Author: elecharny
Date: Thu May 20 23:13:03 2010
New Revision: 946817

URL: http://svn.apache.org/viewvc?rev=946817&view=rev
Log:
Removed two calls to the lookup() method

Modified:
    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/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=946817&r1=946816&r2=946817&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
Thu May 20 23:13:03 2010
@@ -588,14 +588,15 @@ public class SubentryInterceptor extends
     public void delete( NextInterceptor next, DeleteOperationContext opContext ) throws Exception
     {
         DN name = opContext.getDn();
-        Entry entry = opContext.lookup( name, ByPassConstants.LOOKUP_BYPASS );
+        Entry entry = opContext.getEntry();
         EntryAttribute objectClasses = entry.get( objectClassType );
 
         if ( objectClasses.contains( SchemaConstants.SUBENTRY_OC ) )
         {
-            SubtreeSpecification ss = subentryCache.removeSubentry( name.getNormName() ).getSubtreeSpecification();
             next.delete( opContext );
 
+            SubtreeSpecification ss = subentryCache.removeSubentry( name.getNormName() ).getSubtreeSpecification();
+
             /* ----------------------------------------------------------------
              * Find the baseDn for the subentry and use that to search the tree
              * for all entries included by the subtreeSpecification.  Then we

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=946817&r1=946816&r2=946817&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
Thu May 20 23:13:03 2010
@@ -302,7 +302,7 @@ public class TriggerInterceptor extends 
         }
         
         // Gather supplementary data.
-        Entry deletedEntry = deleteContext.lookup( name , ByPassConstants.LOOKUP_BYPASS );
+        Entry deletedEntry = deleteContext.getEntry();
         
         StoredProcedureParameterInjector injector = new DeleteStoredProcedureParameterInjector(
deleteContext, name );
 
@@ -315,6 +315,7 @@ public class TriggerInterceptor extends 
             getActionTimeMappedTriggerSpecsForOperation( triggerSpecs, LdapOperation.DELETE
);
         
         next.delete( deleteContext );
+        
         triggerSpecCache.subentryDeleted( name, deletedEntry );
         
         // Fire AFTER Triggers.



Mime
View raw message