From e114a899bbc0df59f5135f195d24797bf6c1b778 Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Thu, 02 Jan 2014 09:33:43 +0000
Subject: [PATCH] Checkpoint commit for OPENDJ-1235 : Migrate configuration framework
---
opendj-sdk/opendj-admin/src/main/java/org/opends/server/admin/client/spi/PropertySet.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/opendj-sdk/opendj-admin/src/main/java/org/opends/server/admin/client/spi/PropertySet.java b/opendj-sdk/opendj-admin/src/main/java/org/opends/server/admin/client/spi/PropertySet.java
index 7795959..cc506eb 100644
--- a/opendj-sdk/opendj-admin/src/main/java/org/opends/server/admin/client/spi/PropertySet.java
+++ b/opendj-sdk/opendj-admin/src/main/java/org/opends/server/admin/client/spi/PropertySet.java
@@ -35,6 +35,7 @@
import org.opends.server.admin.IllegalPropertyValueException;
import org.opends.server.admin.PropertyDefinition;
+import org.opends.server.admin.PropertyDefinitionsOptions;
import org.opends.server.admin.PropertyIsMandatoryException;
import org.opends.server.admin.PropertyIsSingleValuedException;
import org.opends.server.admin.PropertyOption;
@@ -282,6 +283,8 @@
* property (an empty set indicates that the property should be
* reset to its default behavior). The set will not be referenced
* by this managed object.
+ * @param options
+ * Options to validate property definitions values.
* @throws IllegalPropertyValueException
* If a new pending value is deemed to be invalid according to
* the property definition.
@@ -294,7 +297,8 @@
* If the specified property definition is not associated with
* this managed object.
*/
- <T> void setPropertyValues(PropertyDefinition<T> d, Collection<T> values) {
+ <T> void setPropertyValues(PropertyDefinition<T> d, Collection<T> values,
+ PropertyDefinitionsOptions options) {
MyProperty<T> property = (MyProperty<T>) getProperty(d);
if (values.size() > 1 && !d.hasOption(PropertyOption.MULTI_VALUED)) {
@@ -314,7 +318,7 @@
throw new NullPointerException();
}
- d.validateValue(e);
+ d.validateValue(e, options);
}
// Update the property.
--
Gitblit v1.10.0