From 25767e41837b50d8a577be06e4272c4ae947e837 Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Tue, 04 Sep 2007 18:26:12 +0000
Subject: [PATCH] Improve display of OperationRejectedExceptions in dsconfig.
---
opends/src/server/org/opends/server/tools/dsconfig/DeleteSubCommandHandler.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/opends/src/server/org/opends/server/tools/dsconfig/DeleteSubCommandHandler.java b/opends/src/server/org/opends/server/tools/dsconfig/DeleteSubCommandHandler.java
index 06de23f..b628f5d 100644
--- a/opends/src/server/org/opends/server/tools/dsconfig/DeleteSubCommandHandler.java
+++ b/opends/src/server/org/opends/server/tools/dsconfig/DeleteSubCommandHandler.java
@@ -297,8 +297,14 @@
.getUserFriendlyName());
throw new ClientException(LDAPResultCode.INSUFFICIENT_ACCESS_RIGHTS, msg);
} catch (OperationRejectedException e) {
- Message msg = ERR_DSCFG_ERROR_DELETE_ORE.get(relation
- .getUserFriendlyName(), e.getMessage());
+ Message msg;
+ if (e.getMessages().size() == 1) {
+ msg = ERR_DSCFG_ERROR_DELETE_ORE_SINGLE.get(relation
+ .getUserFriendlyName(), e.getMessagesAsSingleMessage());
+ } else {
+ msg = ERR_DSCFG_ERROR_DELETE_ORE_PLURAL.get(relation
+ .getUserFriendlyName(), e.getMessagesAsSingleMessage());
+ }
throw new ClientException(LDAPResultCode.CONSTRAINT_VIOLATION, msg);
} catch (ManagedObjectNotFoundException e) {
// Ignore the error if the deletion is being forced.
--
Gitblit v1.10.0