From de19fe2956d5a4b3817834191c51989664f8c47c Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Mon, 03 Sep 2007 20:36:20 +0000
Subject: [PATCH] Fix issue 1443: Admin framework: improve error logging in server
---
opends/src/server/org/opends/server/admin/client/OperationRejectedException.java | 26 +++++++++++++++-----------
1 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/opends/src/server/org/opends/server/admin/client/OperationRejectedException.java b/opends/src/server/org/opends/server/admin/client/OperationRejectedException.java
index a2736f0..8f2d81c 100644
--- a/opends/src/server/org/opends/server/admin/client/OperationRejectedException.java
+++ b/opends/src/server/org/opends/server/admin/client/OperationRejectedException.java
@@ -68,18 +68,23 @@
Validator.ensureNotNull(messages);
Validator.ensureTrue(!messages.isEmpty());
- MessageBuilder builder = new MessageBuilder();
+ if (messages.size() == 1) {
+ return ERR_OPERATION_REJECTED_EXCEPTION_SINGLE.get(messages.iterator()
+ .next());
+ } else {
+ MessageBuilder builder = new MessageBuilder();
- boolean isFirst = true;
- for (Message m : messages) {
- if (!isFirst) {
- builder.append("; ");
+ boolean isFirst = true;
+ for (Message m : messages) {
+ if (!isFirst) {
+ builder.append("; ");
+ }
+ builder.append(m);
+ isFirst = false;
}
- builder.append(m);
- isFirst = false;
- }
- return builder.toMessage();
+ return ERR_OPERATION_REJECTED_EXCEPTION_PLURAL.get(builder.toMessage());
+ }
}
// The messages describing the constraint violations that occurred.
@@ -110,8 +115,7 @@
*
* @param message
* The message describing the constraint violation that
- * occurred (must be non-<code>null</code> and
- * non-empty).
+ * occurred.
*/
public OperationRejectedException(Message message) {
this(Collections.singleton(message));
--
Gitblit v1.10.0