From db1acd66e65ed83a94904dac34c765371c04b894 Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Wed, 12 Sep 2007 13:20:17 +0000
Subject: [PATCH] Admin framework: fix bug in deletion referential integrity listener call-back where an applyConfigurationDelete was being invoked and throwing an IllegalStateException for changes that were not applicable to it.
---
opendj-sdk/opends/src/server/org/opends/server/admin/AggregationPropertyDefinition.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/admin/AggregationPropertyDefinition.java b/opendj-sdk/opends/src/server/org/opends/server/admin/AggregationPropertyDefinition.java
index f06b6c3..62a7b38 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/admin/AggregationPropertyDefinition.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/admin/AggregationPropertyDefinition.java
@@ -50,6 +50,7 @@
import org.opends.server.config.ConfigException;
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DN;
+import org.opends.server.types.ResultCode;
@@ -382,8 +383,12 @@
* {@inheritDoc}
*/
public ConfigChangeResult applyConfigurationDelete(S configuration) {
- throw new IllegalStateException("Attempting to delete a referenced "
- + configuration.definition().getUserFriendlyName());
+ if (configuration.dn().equals(dn)) {
+ throw new IllegalStateException("Attempting to delete a referenced "
+ + configuration.definition().getUserFriendlyName());
+ } else {
+ return new ConfigChangeResult(ResultCode.SUCCESS, false);
+ }
}
--
Gitblit v1.10.0