From 1f3592b4ab0a329ed8e54e311b89d2bca68efb81 Mon Sep 17 00:00:00 2001
From: neil_a_wilson <neil_a_wilson@localhost>
Date: Fri, 21 Sep 2007 00:49:05 +0000
Subject: [PATCH] Update a number of result codes to make the values more consistent across operations. Also, eliminate a number of incorrect uses of the OPERATIONS_ERROR result and replace them with the more correct OTHER result.
---
opends/src/server/org/opends/server/tools/dsconfig/SetPropSubCommandHandler.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/opends/src/server/org/opends/server/tools/dsconfig/SetPropSubCommandHandler.java b/opends/src/server/org/opends/server/tools/dsconfig/SetPropSubCommandHandler.java
index c800122..ea75a75 100644
--- a/opends/src/server/org/opends/server/tools/dsconfig/SetPropSubCommandHandler.java
+++ b/opends/src/server/org/opends/server/tools/dsconfig/SetPropSubCommandHandler.java
@@ -322,7 +322,7 @@
}
} catch (CommunicationException e) {
Message msg = ERR_DSCFG_ERROR_MODIFY_CE.get(ufn, e.getMessage());
- throw new ClientException(LDAPResultCode.OPERATIONS_ERROR, msg);
+ throw new ClientException(LDAPResultCode.OTHER, msg);
} catch (ManagedObjectAlreadyExistsException e) {
// Should never happen.
throw new IllegalStateException(e);
@@ -383,16 +383,16 @@
LDAPResultCode.INSUFFICIENT_ACCESS_RIGHTS, msg);
} catch (DefinitionDecodingException e) {
Message msg = ERR_DSCFG_ERROR_GET_CHILD_DDE.get(rufn, rufn, rufn);
- throw new ClientException(LDAPResultCode.OPERATIONS_ERROR, msg);
+ throw new ClientException(LDAPResultCode.OTHER, msg);
} catch (ManagedObjectDecodingException e) {
// FIXME: should not abort here. Instead, display the
// errors (if verbose) and apply the changes to the
// partial managed object.
Message msg = ERR_DSCFG_ERROR_GET_CHILD_MODE.get(rufn);
- throw new ClientException(LDAPResultCode.OPERATIONS_ERROR, msg, e);
+ throw new ClientException(LDAPResultCode.OTHER, msg, e);
} catch (CommunicationException e) {
Message msg = ERR_DSCFG_ERROR_MODIFY_CE.get(ufn, e.getMessage());
- throw new ClientException(LDAPResultCode.OPERATIONS_ERROR, msg);
+ throw new ClientException(LDAPResultCode.OTHER, msg);
} catch (ManagedObjectNotFoundException e) {
Message msg = ERR_DSCFG_ERROR_GET_CHILD_MONFE.get(rufn);
throw new ClientException(LDAPResultCode.NO_SUCH_OBJECT, msg);
@@ -453,7 +453,7 @@
} catch (CommunicationException e) {
Message msg = ERR_DSCFG_ERROR_MODIFY_CE
.get(ufn, e.getMessage());
- throw new ClientException(LDAPResultCode.OPERATIONS_ERROR, msg);
+ throw new ClientException(LDAPResultCode.OTHER, msg);
} catch (ManagedObjectAlreadyExistsException e) {
// Should never happen.
throw new IllegalStateException(e);
@@ -607,15 +607,15 @@
throw new ClientException(LDAPResultCode.INSUFFICIENT_ACCESS_RIGHTS, msg);
} catch (DefinitionDecodingException e) {
Message msg = ERR_DSCFG_ERROR_GET_CHILD_DDE.get(ufn, ufn, ufn);
- throw new ClientException(LDAPResultCode.OPERATIONS_ERROR, msg);
+ throw new ClientException(LDAPResultCode.OTHER, msg);
} catch (ManagedObjectDecodingException e) {
// FIXME: should not abort here. Instead, display the errors (if
// verbose) and apply the changes to the partial managed object.
Message msg = ERR_DSCFG_ERROR_GET_CHILD_MODE.get(ufn);
- throw new ClientException(LDAPResultCode.OPERATIONS_ERROR, msg, e);
+ throw new ClientException(LDAPResultCode.OTHER, msg, e);
} catch (CommunicationException e) {
Message msg = ERR_DSCFG_ERROR_MODIFY_CE.get(ufn, e.getMessage());
- throw new ClientException(LDAPResultCode.OPERATIONS_ERROR, msg);
+ throw new ClientException(LDAPResultCode.OTHER, msg);
} catch (ConcurrentModificationException e) {
Message msg = ERR_DSCFG_ERROR_MODIFY_CME.get(ufn);
throw new ClientException(LDAPResultCode.CONSTRAINT_VIOLATION, msg);
--
Gitblit v1.10.0