From cabc6762d8e122728e0cc31607deaf1695ddafc3 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Fri, 19 Dec 2014 10:30:50 +0000
Subject: [PATCH] OPENDJ-1602 (CR-5566) New pluggable storage based backend
---
opendj-config/src/main/java/org/forgerock/opendj/config/client/spi/Driver.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/client/spi/Driver.java b/opendj-config/src/main/java/org/forgerock/opendj/config/client/spi/Driver.java
index 1a95394..b5ee6d0 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/client/spi/Driver.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/client/spi/Driver.java
@@ -182,13 +182,13 @@
/** Get an inherited property value. */
@SuppressWarnings("unchecked")
private Collection<T> getInheritedProperty(ManagedObjectPath<?, ?> target,
- AbstractManagedObjectDefinition<?, ?> d, String propertyName) {
+ AbstractManagedObjectDefinition<?, ?> definition, String propertyName) {
// First check that the requested type of managed object
// corresponds to the path.
- AbstractManagedObjectDefinition<?, ?> supr = target.getManagedObjectDefinition();
- if (!supr.isParentOf(d)) {
- throw PropertyException.defaultBehaviorException(nextProperty, new DefinitionDecodingException(supr,
- Reason.WRONG_TYPE_INFORMATION));
+ AbstractManagedObjectDefinition<?, ?> actual = target.getManagedObjectDefinition();
+ if (!definition.isParentOf(actual)) {
+ throw PropertyException.defaultBehaviorException(nextProperty,
+ new DefinitionDecodingException(actual, Reason.WRONG_TYPE_INFORMATION));
}
// Save the current property in case of recursion.
@@ -201,7 +201,7 @@
// FIXME: we use the definition taken from the default
// behavior here when we should really use the exact
// definition of the component being created.
- PropertyDefinition<?> pdTmp = d.getPropertyDefinition(propertyName);
+ PropertyDefinition<?> pdTmp = definition.getPropertyDefinition(propertyName);
pd2 = pd1.getClass().cast(pdTmp);
} catch (IllegalArgumentException e) {
throw new PropertyNotFoundException(propertyName);
--
Gitblit v1.10.0