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 2025/01/17 09:10:55 UTC
(directory-server) 03/09: Grab the ServerEntry from the renameContext if the changeLog interceptor is enabled
This is an automated email from the ASF dual-hosted git repository.
elecharny pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/directory-server.git
commit 306ce1195b5f81c126aad99500647c9b69067feb
Author: emmanuel lecharny <el...@apache.org>
AuthorDate: Fri Jan 17 10:00:40 2025 +0100
Grab the ServerEntry from the renameContext if the changeLog interceptor
is enabled
---
.../directory/server/core/changelog/ChangeLogInterceptor.java | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/interceptors/changelog/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java b/interceptors/changelog/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java
index 333b08d4c2..652f4c0fb1 100644
--- a/interceptors/changelog/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java
+++ b/interceptors/changelog/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java
@@ -40,7 +40,6 @@ import org.apache.directory.server.core.api.CoreSession;
import org.apache.directory.server.core.api.DirectoryService;
import org.apache.directory.server.core.api.InterceptorEnum;
import org.apache.directory.server.core.api.changelog.ChangeLog;
-import org.apache.directory.server.core.api.entry.ClonedServerEntry;
import org.apache.directory.server.core.api.entry.ServerEntryUtils;
import org.apache.directory.server.core.api.interceptor.BaseInterceptor;
import org.apache.directory.server.core.api.interceptor.context.AddOperationContext;
@@ -348,13 +347,18 @@ public class ChangeLogInterceptor extends BaseInterceptor
{
Entry serverEntry = null;
- if ( renameContext.getEntry() != null )
+ if ( changeLog.isEnabled() )
{
- serverEntry = ( ( ClonedServerEntry ) renameContext.getEntry() ).getOriginalEntry();
+ serverEntry = renameContext.getOriginalEntry();
}
next( renameContext );
+ if ( !changeLog.isEnabled() )
+ {
+ return;
+ }
+
// After this point, the entry has been modified. The cloned entry contains
// the modified entry, the originalEntry has changed