From 942b39f9a6862b49a1c73a3a972dca1ca9cb3a77 Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Fri, 19 Sep 2014 09:45:19 +0000
Subject: [PATCH] Checkpoint commit for OPENDJ-1536: Rename ErrorResultException to LdapException and remove ErrorResultIOException
---
opendj3-server-dev/src/server/org/opends/server/protocols/http/SdkConnectionAdapter.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/protocols/http/SdkConnectionAdapter.java b/opendj3-server-dev/src/server/org/opends/server/protocols/http/SdkConnectionAdapter.java
index 897ad45..911174e 100644
--- a/opendj3-server-dev/src/server/org/opends/server/protocols/http/SdkConnectionAdapter.java
+++ b/opendj3-server-dev/src/server/org/opends/server/protocols/http/SdkConnectionAdapter.java
@@ -34,7 +34,6 @@
import org.forgerock.opendj.ldap.AbstractAsynchronousConnection;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ConnectionEventListener;
-import org.forgerock.opendj.ldap.ErrorResultException;
import org.forgerock.opendj.ldap.FutureResult;
import org.forgerock.opendj.ldap.FutureResultImpl;
import org.forgerock.opendj.ldap.IntermediateResponseHandler;
@@ -95,6 +94,7 @@
import static org.forgerock.opendj.adapter.server3x.Converters.*;
import static org.forgerock.opendj.ldap.ByteString.*;
+import static org.forgerock.opendj.ldap.LdapException.*;
/**
* Adapter class between LDAP SDK's {@link org.forgerock.opendj.ldap.Connection}
@@ -170,7 +170,7 @@
logger.traceException(e);
clientConnection.removeOperationInProgress(operation.getMessageID());
// TODO JNR add error message??
- futureResult.handleError(ErrorResultException.newErrorResult(ResultCode.OPERATIONS_ERROR, e));
+ futureResult.handleError(newErrorResult(ResultCode.OPERATIONS_ERROR, e));
}
return futureResult;
--
Gitblit v1.10.0