From d94f6d23898f7515e969517f85b8e626667a1e02 Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Fri, 19 Sep 2014 08:56:38 +0000
Subject: [PATCH] Checkpoint commit for OPENDJ-1536: Rename ErrorResultException to LdapException and remove ErrorResultIOException
---
opendj-server3x-adapter/src/main/java/org/forgerock/opendj/adapter/server3x/Converters.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/opendj-server3x-adapter/src/main/java/org/forgerock/opendj/adapter/server3x/Converters.java b/opendj-server3x-adapter/src/main/java/org/forgerock/opendj/adapter/server3x/Converters.java
index 1fbacbd..8cf65f5 100644
--- a/opendj-server3x-adapter/src/main/java/org/forgerock/opendj/adapter/server3x/Converters.java
+++ b/opendj-server3x-adapter/src/main/java/org/forgerock/opendj/adapter/server3x/Converters.java
@@ -41,7 +41,7 @@
import org.forgerock.opendj.ldap.ByteStringBuilder;
import org.forgerock.opendj.ldap.DN;
import org.forgerock.opendj.ldap.DecodeException;
-import org.forgerock.opendj.ldap.ErrorResultException;
+import org.forgerock.opendj.ldap.LdapException;
import org.forgerock.opendj.ldap.LinkedAttribute;
import org.forgerock.opendj.ldap.LinkedHashMapEntry;
import org.forgerock.opendj.ldap.RDN;
@@ -626,7 +626,7 @@
/**
* Populates the result object with the operation details and return the
* result object if it was successful. Otherwise, it throws an
- * {@link ErrorResultException}.
+ * {@link LdapException}.
*
* @param <T>
* the type of the result object
@@ -634,13 +634,13 @@
* used to populate the result
* @param result
* the result object to populate from the Operation
- * @return the result if successful, an {@link ErrorResultException} is thrown
+ * @return the result if successful, an {@link LdapException} is thrown
* otherwise
- * @throws ErrorResultException
+ * @throws LdapException
* when an error occurs
*/
public static <T extends Result> T getResponseResult(final Operation operation, final T result)
- throws ErrorResultException {
+ throws LdapException {
if (operation.getReferralURLs() != null) {
for (String ref : operation.getReferralURLs()) {
result.addReferralURI(ref);
@@ -658,7 +658,7 @@
if (result.isSuccess()) {
return result;
} else {
- throw ErrorResultException.newErrorResult(result);
+ throw LdapException.newErrorResult(result);
}
}
@@ -669,10 +669,10 @@
* @param operation
* value to convert
* @return the converted value
- * @throws ErrorResultException
+ * @throws LdapException
* when an error occurs
*/
- public static Result getResponseResult(final Operation operation) throws ErrorResultException {
+ public static Result getResponseResult(final Operation operation) throws LdapException {
return getResponseResult(operation, newSDKResult(operation));
}
--
Gitblit v1.10.0