From 139d572584d8fe12a0f1bee2f3aeb73710685bbe Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Mon, 22 Oct 2012 14:52:18 +0000
Subject: [PATCH] Minor fixes for query processing.
---
opendj3/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/CompositeAttributeMapper.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/opendj3/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/CompositeAttributeMapper.java b/opendj3/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/CompositeAttributeMapper.java
index bef1872..af135f6 100644
--- a/opendj3/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/CompositeAttributeMapper.java
+++ b/opendj3/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/CompositeAttributeMapper.java
@@ -86,8 +86,10 @@
}
public void handleResult(final Map<String, Object> result) {
- synchronized (this) {
- results.add(result);
+ if (result != null && !result.isEmpty()) {
+ synchronized (this) {
+ results.add(result);
+ }
}
if (latch.decrementAndGet() == 0) {
final Map<String, Object> mergeResult;
--
Gitblit v1.10.0