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/HTTPClientConnection.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/protocols/http/HTTPClientConnection.java b/opendj3-server-dev/src/server/org/opends/server/protocols/http/HTTPClientConnection.java
index 5bb5dd7..62bd175 100644
--- a/opendj3-server-dev/src/server/org/opends/server/protocols/http/HTTPClientConnection.java
+++ b/opendj3-server-dev/src/server/org/opends/server/protocols/http/HTTPClientConnection.java
@@ -39,7 +39,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.LocalizableMessageBuilder;
import org.forgerock.i18n.slf4j.LocalizedLogger;
-import org.forgerock.opendj.ldap.ErrorResultException;
+import org.forgerock.opendj.ldap.LdapException;
import org.forgerock.opendj.ldap.FutureResultImpl;
import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.SearchResultHandler;
@@ -80,7 +80,7 @@
import org.opends.server.types.SearchResultReference;
import static org.forgerock.opendj.adapter.server3x.Converters.*;
-import static org.forgerock.opendj.ldap.ErrorResultException.*;
+import static org.forgerock.opendj.ldap.LdapException.*;
import static org.opends.messages.ProtocolMessages.*;
import static org.opends.server.loggers.AccessLogger.*;
@@ -419,7 +419,7 @@
.getMessageID(), toResponseProtocolOp(operation)));
}
}
- catch (ErrorResultException e)
+ catch (LdapException e)
{
op.futureResult.handleError(e);
}
@@ -755,7 +755,7 @@
{
try
{
- op.futureResult.handleError(ErrorResultException.newErrorResult(ResultCode.CANCELLED));
+ op.futureResult.handleError(newErrorResult(ResultCode.CANCELLED));
op.operation.abort(cancelRequest);
if (keepStats)
--
Gitblit v1.10.0