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-config/src/main/java/org/forgerock/opendj/config/dsconfig/PropertyValueEditor.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/PropertyValueEditor.java b/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/PropertyValueEditor.java
index 0742ca2..1ce45f5 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/PropertyValueEditor.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/PropertyValueEditor.java
@@ -66,7 +66,7 @@
import org.forgerock.opendj.config.client.ManagedObjectDecodingException;
import org.forgerock.opendj.config.client.ManagementContext;
import org.forgerock.opendj.ldap.AuthorizationException;
-import org.forgerock.opendj.ldap.ErrorResultException;
+import org.forgerock.opendj.ldap.LdapException;
import org.forgerock.util.Reject;
import com.forgerock.opendj.cli.ClientException;
@@ -125,7 +125,7 @@
LocalizableMessage pufn = path.getManagedObjectDefinition().getUserFriendlyName();
LocalizableMessage msg = ERR_DSCFG_ERROR_GET_PARENT_MODE.get(pufn);
throw new ClientException(ReturnCode.OTHER, msg, e);
- } catch (ErrorResultException e) {
+ } catch (LdapException e) {
LocalizableMessage msg = ERR_DSCFG_ERROR_CREATE_CE.get(ufn, e.getMessage());
throw new ClientException(ReturnCode.CLIENT_SIDE_SERVER_DOWN, msg);
} catch (ManagedObjectNotFoundException e) {
@@ -402,7 +402,7 @@
} catch (ManagedObjectNotFoundException e) {
this.e = new ClientException(ReturnCode.NO_SUCH_OBJECT, e.getMessageObject());
return MenuResult.cancel();
- } catch (ErrorResultException e) {
+ } catch (LdapException e) {
this.e = new ClientException(ReturnCode.APPLICATION_ERROR, LocalizableMessage.raw(e.getMessage()));
return MenuResult.quit();
}
@@ -629,7 +629,7 @@
} catch (ManagedObjectNotFoundException e) {
this.e = new ClientException(ReturnCode.NO_SUCH_OBJECT, e.getMessageObject());
return MenuResult.cancel();
- } catch (ErrorResultException e) {
+ } catch (LdapException e) {
this.e = new ClientException(ReturnCode.APPLICATION_ERROR, LocalizableMessage.raw(e.getMessage()));
return MenuResult.quit();
}
@@ -1420,7 +1420,7 @@
} catch (ManagedObjectNotFoundException e) {
this.e = new ClientException(ReturnCode.NO_SUCH_OBJECT, e.getMessageObject());
return MenuResult.cancel();
- } catch (ErrorResultException e) {
+ } catch (LdapException e) {
this.e = new ClientException(ReturnCode.APPLICATION_ERROR, LocalizableMessage.raw(e.getMessage()));
return MenuResult.quit();
}
--
Gitblit v1.10.0