From fe9d45d7f26b89b9fb2b87011e1656d4feecf551 Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Mon, 24 Mar 2014 14:07:56 +0000
Subject: [PATCH] OPENDJ-1343 Migrate dsconfig - Removed CommunicationException from dsconfig package. - Replaced ReturnCode.TODO by appropriate return code.
---
opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/PropertyValueEditor.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/PropertyValueEditor.java b/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/PropertyValueEditor.java
index f2675bd..3f50667 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/PropertyValueEditor.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/PropertyValueEditor.java
@@ -474,13 +474,13 @@
try {
values.addAll(Arrays.asList(context.listManagedObjects(path, rd)));
} catch (AuthorizationException e) {
- this.e = new ClientException(ReturnCode.TODO, LocalizableMessage.raw(e.getMessage()));
+ this.e = new ClientException(ReturnCode.CLIENT_SIDE_PARAM_ERROR, LocalizableMessage.raw(e.getMessage()));
return MenuResult.quit();
} catch (ManagedObjectNotFoundException e) {
- this.e = new ClientException(ReturnCode.TODO, e.getMessageObject());
+ this.e = new ClientException(ReturnCode.NO_SUCH_OBJECT, e.getMessageObject());
return MenuResult.cancel();
} catch (ErrorResultException e) {
- this.e = new ClientException(ReturnCode.TODO, LocalizableMessage.raw(e.getMessage()));
+ this.e = new ClientException(ReturnCode.APPLICATION_ERROR, LocalizableMessage.raw(e.getMessage()));
return MenuResult.quit();
}
@@ -735,13 +735,13 @@
try {
values.addAll(Arrays.asList(context.listManagedObjects(path, rd)));
} catch (AuthorizationException e) {
- this.e = new ClientException(ReturnCode.TODO, LocalizableMessage.raw(e.getMessage()));
+ this.e = new ClientException(ReturnCode.CLIENT_SIDE_PARAM_ERROR, LocalizableMessage.raw(e.getMessage()));
return MenuResult.quit();
} catch (ManagedObjectNotFoundException e) {
- this.e = new ClientException(ReturnCode.TODO, e.getMessageObject());
+ this.e = new ClientException(ReturnCode.NO_SUCH_OBJECT, e.getMessageObject());
return MenuResult.cancel();
} catch (ErrorResultException e) {
- this.e = new ClientException(ReturnCode.TODO, LocalizableMessage.raw(e.getMessage()));
+ this.e = new ClientException(ReturnCode.APPLICATION_ERROR, LocalizableMessage.raw(e.getMessage()));
return MenuResult.quit();
}
@@ -1628,13 +1628,13 @@
try {
values.addAll(Arrays.asList(context.listManagedObjects(path, rd)));
} catch (AuthorizationException e) {
- this.e = new ClientException(ReturnCode.TODO, LocalizableMessage.raw(e.getMessage()));
+ this.e = new ClientException(ReturnCode.CLIENT_SIDE_PARAM_ERROR, LocalizableMessage.raw(e.getMessage()));
return MenuResult.quit();
} catch (ManagedObjectNotFoundException e) {
- this.e = new ClientException(ReturnCode.TODO, e.getMessageObject());
+ this.e = new ClientException(ReturnCode.NO_SUCH_OBJECT, e.getMessageObject());
return MenuResult.cancel();
} catch (ErrorResultException e) {
- this.e = new ClientException(ReturnCode.TODO, LocalizableMessage.raw(e.getMessage()));
+ this.e = new ClientException(ReturnCode.APPLICATION_ERROR, LocalizableMessage.raw(e.getMessage()));
return MenuResult.quit();
}
--
Gitblit v1.10.0