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-server2x-adapter/src/main/java/org/forgerock/opendj/adapter/server2x/Adapters.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/opendj-server2x-adapter/src/main/java/org/forgerock/opendj/adapter/server2x/Adapters.java b/opendj-server2x-adapter/src/main/java/org/forgerock/opendj/adapter/server2x/Adapters.java
index 0139638..aed623a 100644
--- a/opendj-server2x-adapter/src/main/java/org/forgerock/opendj/adapter/server2x/Adapters.java
+++ b/opendj-server2x-adapter/src/main/java/org/forgerock/opendj/adapter/server2x/Adapters.java
@@ -79,6 +79,7 @@
 
 import static org.forgerock.opendj.adapter.server2x.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));
         }
     }
 
@@ -346,8 +347,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(getResultCode(bindOperation));
@@ -356,7 +356,7 @@
                 if (result.isSuccess()) {
                     return result;
                 } else {
-                    throw LdapException.newErrorResult(result);
+                    throw newLdapException(result);
                 }
             }
 

--
Gitblit v1.10.0