From b8f496a9076253f7dc672d361b7bd65d4a110a29 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Tue, 05 Mar 2013 16:05:52 +0000
Subject: [PATCH] Partial fix for OPENDJ-699: Implement DN reference mapping
---
opendj3/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/SimpleAttributeMapper.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/opendj3/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/SimpleAttributeMapper.java b/opendj3/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/SimpleAttributeMapper.java
index 2597572..c014547 100644
--- a/opendj3/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/SimpleAttributeMapper.java
+++ b/opendj3/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/SimpleAttributeMapper.java
@@ -193,12 +193,13 @@
final Function<ByteString, ?, Void> f =
decoder == null ? fixedFunction(byteStringToJson(), ldapAttributeName) : decoder;
final Object value;
- if (isSingleValued || ldapAttributeName.getAttributeType().isSingleValue()) {
+ if (attributeIsSingleValued()) {
value = e.parseAttribute(ldapAttributeName).as(f, defaultJSONValue);
} else {
- value = e.parseAttribute(ldapAttributeName).asSetOf(f, defaultJSONValues);
+ final Set<Object> s = e.parseAttribute(ldapAttributeName).asSetOf(f, defaultJSONValues);
+ value = s.isEmpty() ? null : s;
}
- h.handleResult(new JsonValue(value));
+ h.handleResult(value != null ? new JsonValue(value) : null);
}
@Override
--
Gitblit v1.10.0