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-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Rest2LDAP.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Rest2LDAP.java b/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Rest2LDAP.java
index 40af8f0..a0a3d26 100644
--- a/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Rest2LDAP.java
+++ b/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Rest2LDAP.java
@@ -11,7 +11,7 @@
* Header, with the fields enclosed by brackets [] replaced by your own identifying
* information: "Portions copyright [year] [name of copyright owner]".
*
- * Copyright 2013 ForgeRock AS.
+ * Copyright 2013-2014 ForgeRock AS.
*/
package org.forgerock.opendj.rest2ldap;
@@ -50,7 +50,7 @@
import org.forgerock.opendj.ldap.DN;
import org.forgerock.opendj.ldap.Entry;
import org.forgerock.opendj.ldap.EntryNotFoundException;
-import org.forgerock.opendj.ldap.ErrorResultException;
+import org.forgerock.opendj.ldap.LdapException;
import org.forgerock.opendj.ldap.FailoverLoadBalancingAlgorithm;
import org.forgerock.opendj.ldap.Filter;
import org.forgerock.opendj.ldap.LDAPConnectionFactory;
@@ -794,7 +794,7 @@
/**
* Adapts a {@code Throwable} to a {@code ResourceException}. If the
- * {@code Throwable} is an LDAP {@code ErrorResultException} then an
+ * {@code Throwable} is an LDAP {@link LdapException} then an
* appropriate {@code ResourceException} is returned, otherwise an
* {@code InternalServerErrorException} is returned.
*
@@ -830,7 +830,7 @@
resourceResultCode = ResourceException.INTERNAL_ERROR;
} catch (final TimeoutResultException e) {
resourceResultCode = 408;
- } catch (final ErrorResultException e) {
+ } catch (final LdapException e) {
final ResultCode rc = e.getResult().getResultCode();
if (rc.equals(ResultCode.ADMIN_LIMIT_EXCEEDED)) {
resourceResultCode = 413; // Request Entity Too Large
--
Gitblit v1.10.0