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/ObjectAttributeMapper.java | 10 +++-------
1 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/opendj3/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/ObjectAttributeMapper.java b/opendj3/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/ObjectAttributeMapper.java
index 818bd11..0251974 100644
--- a/opendj3/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/ObjectAttributeMapper.java
+++ b/opendj3/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/ObjectAttributeMapper.java
@@ -106,10 +106,6 @@
}
}
- boolean isEmpty() {
- return mappings.isEmpty();
- }
-
@Override
void toJSON(final Context c, final Entry e, final ResultHandler<JsonValue> h) {
// Use an accumulator which will aggregate the results from the subordinate mappers into
@@ -143,7 +139,8 @@
@Override
public Map.Entry<String, JsonValue> apply(final JsonValue value,
final Void p) {
- return new SimpleImmutableEntry<String, JsonValue>(mapping.name, value);
+ return value != null ? new SimpleImmutableEntry<String, JsonValue>(
+ mapping.name, value) : null;
}
}, handler));
}
@@ -179,8 +176,7 @@
case 0:
return Collections.emptyList();
case 1:
- return value.get(0) != null ? value.get(0) : Collections
- .<Attribute> emptyList();
+ return value.get(0);
default:
final List<Attribute> attributes =
new ArrayList<Attribute>(value.size());
--
Gitblit v1.10.0