From 24d13321b6ca24869d09b71b86b934e981925607 Mon Sep 17 00:00:00 2001
From: ludovicp <ludovicp@localhost>
Date: Mon, 31 May 2010 08:53:37 +0000
Subject: [PATCH] Resolve an issue when an exception is raised during Rename operations under stress
---
opends/src/server/org/opends/server/authorization/dseecompat/AciListenerManager.java | 27 +++++++++++++++++++++------
1 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/opends/src/server/org/opends/server/authorization/dseecompat/AciListenerManager.java b/opends/src/server/org/opends/server/authorization/dseecompat/AciListenerManager.java
index 5ee7739..09cf14b 100644
--- a/opends/src/server/org/opends/server/authorization/dseecompat/AciListenerManager.java
+++ b/opends/src/server/org/opends/server/authorization/dseecompat/AciListenerManager.java
@@ -105,7 +105,11 @@
public void doPostSynchronization(
PostSynchronizationAddOperation addOperation)
{
- doPostAdd(addOperation.getEntryToAdd());
+ Entry entry = addOperation.getEntryToAdd();
+ if (entry != null)
+ {
+ doPostAdd(entry);
+ }
}
@@ -116,7 +120,11 @@
public void doPostSynchronization(
PostSynchronizationDeleteOperation deleteOperation)
{
- doPostDelete(deleteOperation.getEntryToDelete());
+ Entry entry = deleteOperation.getEntryToDelete();
+ if (entry != null)
+ {
+ doPostDelete(entry);
+ }
}
@@ -127,8 +135,11 @@
public void doPostSynchronization(
PostSynchronizationModifyDNOperation modifyDNOperation)
{
- doPostModifyDN(modifyDNOperation.getOriginalEntry().getDN(),
- modifyDNOperation.getUpdatedEntry().getDN());
+ Entry entry = modifyDNOperation.getUpdatedEntry();
+ if (entry != null)
+ {
+ doPostModifyDN(entry.getDN(), entry.getDN());
+ }
}
@@ -139,8 +150,12 @@
public void doPostSynchronization(
PostSynchronizationModifyOperation modifyOperation)
{
- doPostModify(modifyOperation.getModifications(), modifyOperation
- .getCurrentEntry(), modifyOperation.getModifiedEntry());
+ Entry entry = modifyOperation.getCurrentEntry();
+ Entry modEntry = modifyOperation.getModifiedEntry();
+ if ((entry != null) && (modEntry != null))
+ {
+ doPostModify(modifyOperation.getModifications(), entry, modEntry);
+ }
}
--
Gitblit v1.10.0