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/Driver.java |   16 +++++++++++-----
 1 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/opendj-sdk/opendj-admin/src/main/java/org/opends/server/admin/client/spi/Driver.java b/opendj-sdk/opendj-admin/src/main/java/org/opends/server/admin/client/spi/Driver.java
index ecae3a8..40a4574 100644
--- a/opendj-sdk/opendj-admin/src/main/java/org/opends/server/admin/client/spi/Driver.java
+++ b/opendj-sdk/opendj-admin/src/main/java/org/opends/server/admin/client/spi/Driver.java
@@ -51,6 +51,7 @@
 import org.opends.server.admin.ManagedObjectPath;
 import org.opends.server.admin.OptionalRelationDefinition;
 import org.opends.server.admin.PropertyDefinition;
+import org.opends.server.admin.PropertyDefinitionsOptions;
 import org.opends.server.admin.PropertyException;
 import org.opends.server.admin.PropertyIsSingleValuedException;
 import org.opends.server.admin.PropertyNotFoundException;
@@ -136,7 +137,7 @@
 
             for (String stringValue : stringValues) {
                 try {
-                    values.add(nextProperty.decodeValue(stringValue));
+                    values.add(nextProperty.decodeValue(stringValue, propertyDefOptions));
                 } catch (IllegalPropertyValueStringException e) {
                     exception = new DefaultBehaviorException(nextProperty, e);
                     break;
@@ -226,7 +227,7 @@
                     Collection<T> tmp = find(target, pd2);
                     Collection<T> values = new ArrayList<T>(tmp.size());
                     for (T value : tmp) {
-                        pd1.validateValue(value);
+                        pd1.validateValue(value, propertyDefOptions);
                         values.add(value);
                     }
                     return values;
@@ -254,11 +255,16 @@
         }
     };
 
+    private final PropertyDefinitionsOptions propertyDefOptions;
+
     /**
-     * Creates a new abstract management context.
+     * Creates a new abstract driver.
+     *
+     * @param propertyDefOptions
+     *            Decoding options for property definitions values.
      */
-    protected Driver() {
-        // No implementation required.
+    protected Driver(PropertyDefinitionsOptions propertyDefOptions) {
+        this.propertyDefOptions = propertyDefOptions;
     }
 
     /**

--
Gitblit v1.10.0