From 3f6373b52c42fd596d3659d335542909cfdd5fbb Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Fri, 20 Dec 2013 14:37:56 +0000
Subject: [PATCH] Checkpoint commit for OPENDJ-1235 : Migrate configuration framework
---
opendj-sdk/opendj-admin/src/main/java/org/opends/server/admin/AggregationPropertyDefinition.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/opendj-sdk/opendj-admin/src/main/java/org/opends/server/admin/AggregationPropertyDefinition.java b/opendj-sdk/opendj-admin/src/main/java/org/opends/server/admin/AggregationPropertyDefinition.java
index 29e126b..56c4ef1 100644
--- a/opendj-sdk/opendj-admin/src/main/java/org/opends/server/admin/AggregationPropertyDefinition.java
+++ b/opendj-sdk/opendj-admin/src/main/java/org/opends/server/admin/AggregationPropertyDefinition.java
@@ -348,7 +348,7 @@
public boolean isUsable(ServerManagedObject<?> managedObject, Collection<LocalizableMessage> unacceptableReasons)
throws ConfigException {
SortedSet<String> names = managedObject.getPropertyValues(AggregationPropertyDefinition.this);
- ServerManagementContext context = ServerManagementContext.getInstance();
+ ServerManagementContext context = managedObject.getServerContext();
LocalizableMessage thisUFN = managedObject.getManagedObjectDefinition().getUserFriendlyName();
String thisDN = managedObject.getDN().toString();
LocalizableMessage thatUFN = getRelationDefinition().getUserFriendlyName();
@@ -404,7 +404,7 @@
// Delete listeners need to be registered against the parent
// entry of the referenced components.
- ServerManagementContext context = ServerManagementContext.getInstance();
+ ServerManagementContext context = managedObject.getServerContext();
ManagedObjectPath<?, ?> parentPath = getParentPath();
ServerManagedObject<?> parent = context.getManagedObject(parentPath);
@@ -443,7 +443,7 @@
@Override
public void performPostDelete(ServerManagedObject<?> managedObject) throws ConfigException {
// Remove any registered delete and change listeners.
- ServerManagementContext context = ServerManagementContext.getInstance();
+ ServerManagementContext context = managedObject.getServerContext();
DN dn = managedObject.getDN();
// Delete listeners need to be deregistered against the parent
--
Gitblit v1.10.0