Minor fixes for query processing.

Matthew Swift

22.52.2012 139d572584d8fe12a0f1bee2f3aeb73710685bbe

Minor fixes for query processing.

 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;

 opendj3/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/ConstantAttributeMapper.java

@@ -63,9 +63,7 @@
    public void toJson(final ServerContext c, final Entry e,
            final ResultHandler<Map<String, Object>> h) {
        // FIXME: how do we know if the user requested it???
        final Map<String, Object> result = Collections.singletonMap(jsonAttributeName,
                jsonAttributeValue);
        h.handleResult(result);
        h.handleResult(Collections.singletonMap(jsonAttributeName, jsonAttributeValue));

    }


 opendj3/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/LDAPCollectionResourceProvider.java

@@ -127,7 +127,7 @@
                    final ResourceException result = pendingResult.get();
                    if (result != null && resultSent.compareAndSet(false, true)) {
                        if (result == SUCCESS) {
                            handler.handleResult(null);
                            handler.handleResult(new QueryResult());
                        } else {
                            handler.handleError(result);
                        }

 opendj3/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/SimpleAttributeMapper.java

@@ -107,8 +107,9 @@
            } else {
                value = a.parse().asSetOf(f, defaultValue);
            }
            final Map<String, Object> result = Collections.singletonMap(jsonAttributeName, value);
            h.handleResult(result);
            h.handleResult(Collections.singletonMap(jsonAttributeName, value));
        } else {
            h.handleResult(null);
        }
    }