directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r895848 - /directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/event/EventInterceptor.java
Date Tue, 05 Jan 2010 02:10:48 GMT
Author: elecharny
Date: Tue Jan  5 02:10:47 2010
New Revision: 895848

URL: http://svn.apache.org/viewvc?rev=895848&view=rev
Log:
Fixed a regression introduced while fixing PersistentSearch

Modified:
    directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/event/EventInterceptor.java

Modified: directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/event/EventInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/event/EventInterceptor.java?rev=895848&r1=895847&r2=895848&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/event/EventInterceptor.java
(original)
+++ directory/apacheds/branches/apacheds-schema/core/src/main/java/org/apache/directory/server/core/event/EventInterceptor.java
Tue Jan  5 02:10:47 2010
@@ -189,7 +189,9 @@
 
     public void modify( NextInterceptor next, final ModifyOperationContext opContext ) throws
Exception
     {
-        List<RegistrationEntry> selecting = getSelectingRegistrations( opContext.getDn(),
opContext.getEntry() );
+        ClonedServerEntry oriEntry = opContext.lookup( opContext.getDn(), ByPassConstants.LOOKUP_BYPASS
);
+        List<RegistrationEntry> selecting = getSelectingRegistrations( opContext.getDn(),
oriEntry );
+        
         next.modify( opContext );
 
         if ( selecting.isEmpty() )
@@ -197,7 +199,7 @@
             return;
         }
 
-        // Get the modifed entry
+        // Get the modified entry
         ClonedServerEntry alteredEntry = opContext.lookup( opContext.getDn(), ByPassConstants.LOOKUP_BYPASS
);
         opContext.setAlteredEntry( alteredEntry );
 
@@ -213,7 +215,9 @@
 
     public void rename( NextInterceptor next, RenameOperationContext opContext ) throws Exception
     {
-        List<RegistrationEntry> selecting = getSelectingRegistrations( opContext.getDn(),
opContext.getEntry() );
+        ClonedServerEntry oriEntry = opContext.lookup( opContext.getDn(), ByPassConstants.LOOKUP_BYPASS
);
+        List<RegistrationEntry> selecting = getSelectingRegistrations( opContext.getDn(),
oriEntry );
+        
         next.rename( opContext );
 
         if ( selecting.isEmpty() )
@@ -266,11 +270,11 @@
 
     public void move( NextInterceptor next, MoveOperationContext opContext ) throws Exception
     {
-        List<RegistrationEntry> selecting = getSelectingRegistrations( opContext.getDn(),
opContext.getEntry() );
+        ClonedServerEntry oriEntry = opContext.lookup( opContext.getDn(), ByPassConstants.LOOKUP_BYPASS
);
+        List<RegistrationEntry> selecting = getSelectingRegistrations( opContext.getDn(),
oriEntry );
+        
         next.move( opContext );
 
-        ClonedServerEntry alteredEntry = opContext.lookup( opContext.getDn(), ByPassConstants.LOOKUP_BYPASS
);
-
         if ( selecting.isEmpty() )
         {
             return;



Mime
View raw message