From 706dc5606f54691d3f64e4cc0575277daf460e56 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Fri, 13 Dec 2013 23:31:52 +0000
Subject: [PATCH] Minor fix for OPENDJ-1235: Migrate configuration framework
---
opendj-admin/src/test/java/org/forgerock/opendj/config/ConfigurationMock.java | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/opendj-admin/src/test/java/org/forgerock/opendj/config/ConfigurationMock.java b/opendj-admin/src/test/java/org/forgerock/opendj/config/ConfigurationMock.java
index 1ea2ae0..ecaa9da 100644
--- a/opendj-admin/src/test/java/org/forgerock/opendj/config/ConfigurationMock.java
+++ b/opendj-admin/src/test/java/org/forgerock/opendj/config/ConfigurationMock.java
@@ -40,9 +40,9 @@
import org.opends.server.admin.DefaultBehaviorProvider;
import org.opends.server.admin.DefaultBehaviorProviderVisitor;
import org.opends.server.admin.DefinedDefaultBehaviorProvider;
-import org.opends.server.admin.EnumPropertyDefinition;
import org.opends.server.admin.ManagedObjectDefinition;
import org.opends.server.admin.PropertyDefinition;
+import org.opends.server.admin.PropertyOption;
import org.opends.server.admin.RelativeInheritedDefaultBehaviorProvider;
import org.opends.server.admin.UndefinedDefaultBehaviorProvider;
@@ -144,7 +144,7 @@
* @throws Exception
* If an error occurs.
*/
- @SuppressWarnings({ "unchecked", "unused" })
+ @SuppressWarnings("unchecked")
private <T> Object getDefaultValue(ManagedObjectDefinition<?, ?> definition,
Method getPropertyDefMethod, Class<T> propertyReturnClass) throws Exception {
PropertyDefinition<T> propertyDefinition = (PropertyDefinition<T>) getPropertyDefMethod.invoke(definition);
@@ -153,8 +153,7 @@
MockProviderVisitor<T> visitor = new MockProviderVisitor<T>(propertyDefinition);
Collection<T> values = defaultBehaviorProvider.accept(visitor, null);
- if (propertyDefinition instanceof EnumPropertyDefinition) {
- // enum values returned as a sorted set
+ if (propertyDefinition.hasOption(PropertyOption.MULTI_VALUED)) {
return values;
} else {
// single value returned
--
Gitblit v1.10.0