From 600f6cb4356f2355a004604b9353505f0c2f7f49 Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Mon, 29 Sep 2014 10:04:51 +0000
Subject: [PATCH] OPENDJ-1536 OPENDJ-1285 Rename FutureResult classes hierarchy in the SDK to enhance code consistency
---
opendj-server3x-adapter/src/main/java/org/forgerock/opendj/adapter/server3x/Adapters.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/opendj-server3x-adapter/src/main/java/org/forgerock/opendj/adapter/server3x/Adapters.java b/opendj-server3x-adapter/src/main/java/org/forgerock/opendj/adapter/server3x/Adapters.java
index 049b09e..e4ce2d8 100644
--- a/opendj-server3x-adapter/src/main/java/org/forgerock/opendj/adapter/server3x/Adapters.java
+++ b/opendj-server3x-adapter/src/main/java/org/forgerock/opendj/adapter/server3x/Adapters.java
@@ -79,6 +79,7 @@
import static org.forgerock.opendj.adapter.server3x.Converters.*;
import static org.forgerock.opendj.ldap.ByteString.*;
+import static org.forgerock.opendj.ldap.LdapException.*;
import static org.forgerock.util.promise.Promises.*;
/**
@@ -190,7 +191,7 @@
try {
return newConnection(new InternalClientConnection(to(dn)));
} catch (DirectoryException e) {
- throw LdapException.newErrorResult(Responses.newResult(ResultCode.NO_SUCH_OBJECT));
+ throw newLdapException(Responses.newResult(ResultCode.NO_SUCH_OBJECT));
}
}
@@ -345,8 +346,7 @@
bindClient.dispose();
} else { // not supported
- throw LdapException.newErrorResult(Responses
- .newResult(ResultCode.AUTH_METHOD_NOT_SUPPORTED));
+ throw newLdapException(Responses.newResult(ResultCode.AUTH_METHOD_NOT_SUPPORTED));
}
BindResult result = Responses.newBindResult(bindOperation.getResultCode());
result.setServerSASLCredentials(bindOperation.getSASLCredentials());
@@ -354,7 +354,7 @@
if (result.isSuccess()) {
return result;
} else {
- throw LdapException.newErrorResult(result);
+ throw newLdapException(result);
}
}
--
Gitblit v1.10.0