From 19536840ae2c706f4ad9ff4742e52dfc5f6ebea7 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Sat, 23 Mar 2013 01:46:37 +0000
Subject: [PATCH] Partial fix for OPENDJ-694: Implement HTTP BASIC authentication
---
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 2297aae..4706fbe 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
@@ -21,7 +21,7 @@
import static java.util.Collections.singletonList;
import static org.forgerock.opendj.ldap.Filter.alwaysFalse;
import static org.forgerock.opendj.ldap.Functions.fixedFunction;
-import static org.forgerock.opendj.rest2ldap.Utils.adapt;
+import static org.forgerock.opendj.rest2ldap.Rest2LDAP.asResourceException;
import static org.forgerock.opendj.rest2ldap.Utils.base64ToByteString;
import static org.forgerock.opendj.rest2ldap.Utils.byteStringToBase64;
import static org.forgerock.opendj.rest2ldap.Utils.byteStringToJson;
@@ -183,7 +183,8 @@
final String operator, final Object valueAssertion, final ResultHandler<Filter> h) {
if (jsonAttribute.isEmpty()) {
try {
- final ByteString va = valueAssertion != null ? encoder().apply(valueAssertion, null) : null;
+ final ByteString va =
+ valueAssertion != null ? encoder().apply(valueAssertion, null) : null;
h.handleResult(toFilter(c, type, ldapAttributeName.toString(), va));
} catch (Exception e) {
// Invalid assertion value - bad request.
@@ -212,7 +213,7 @@
h.handleResult(value != null ? new JsonValue(value) : null);
} catch (Exception ex) {
// The LDAP attribute could not be decoded.
- h.handleError(adapt(ex));
+ h.handleError(asResourceException(ex));
}
}
--
Gitblit v1.10.0