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/ReferenceAttributeMapper.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/opendj3/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/ReferenceAttributeMapper.java b/opendj3/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/ReferenceAttributeMapper.java
index ae72b5f..51b3a09 100644
--- a/opendj3/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/ReferenceAttributeMapper.java
+++ b/opendj3/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/ReferenceAttributeMapper.java
@@ -17,8 +17,8 @@
import static java.util.Collections.singletonList;
import static org.forgerock.opendj.ldap.ErrorResultException.newErrorResult;
+import static org.forgerock.opendj.rest2ldap.Rest2LDAP.asResourceException;
import static org.forgerock.opendj.rest2ldap.Utils.accumulate;
-import static org.forgerock.opendj.rest2ldap.Utils.adapt;
import static org.forgerock.opendj.rest2ldap.Utils.ensureNotNull;
import static org.forgerock.opendj.rest2ldap.Utils.transform;
import static org.forgerock.opendj.rest2ldap.WritabilityPolicy.READ_WRITE;
@@ -199,7 +199,7 @@
@Override
public void handleErrorResult(final ErrorResultException error) {
- h.handleError(adapt(error)); // Propagate.
+ h.handleError(asResourceException(error)); // Propagate.
}
@Override
@@ -234,7 +234,7 @@
readEntry(c, dn, h);
} catch (final Exception ex) {
// The LDAP attribute could not be decoded.
- h.handleError(adapt(ex));
+ h.handleError(asResourceException(ex));
}
} else {
try {
@@ -264,7 +264,7 @@
}
} catch (final Exception ex) {
// The LDAP attribute could not be decoded.
- h.handleError(adapt(ex));
+ h.handleError(asResourceException(ex));
}
}
}
@@ -373,7 +373,7 @@
.toString()
+ "' is ambiguous");
} catch (ErrorResultException e) {
- re = adapt(e);
+ re = asResourceException(e);
}
exception.compareAndSet(null, re);
completeIfNecessary();
@@ -433,7 +433,7 @@
@Override
public void handleErrorResult(final ErrorResultException error) {
if (!(error instanceof EntryNotFoundException)) {
- handler.handleError(adapt(error));
+ handler.handleError(asResourceException(error));
} else {
// The referenced entry does not exist so ignore it since it cannot be mapped.
handler.handleResult(null);
--
Gitblit v1.10.0