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/CreateSubCommandHandler.java | 9 ++-------
1 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/CreateSubCommandHandler.java b/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/CreateSubCommandHandler.java
index f39d1b7..73b51d6 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/CreateSubCommandHandler.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/CreateSubCommandHandler.java
@@ -80,7 +80,6 @@
import org.forgerock.opendj.config.conditions.ContainsCondition;
import org.forgerock.opendj.ldap.AuthorizationException;
import org.forgerock.opendj.ldap.ErrorResultException;
-import org.opends.server.admin.client.CommunicationException;
import com.forgerock.opendj.cli.Argument;
import com.forgerock.opendj.cli.ArgumentException;
@@ -873,11 +872,11 @@
} catch (ConcurrentModificationException e) {
LocalizableMessage msg = ERR_DSCFG_ERROR_CREATE_CME.get(irelation
.getUserFriendlyName());
- throw new ClientException(ReturnCode.TODO, msg);
+ throw new ClientException(ReturnCode.CONSTRAINT_VIOLATION, msg);
} catch (ErrorResultException e) {
LocalizableMessage msg = ERR_DSCFG_ERROR_CREATE_CE.get(irelation
.getUserFriendlyName(), e.getMessage());
- throw new ClientException(ReturnCode.TODO, msg);
+ throw new ClientException(ReturnCode.APPLICATION_ERROR, msg);
} catch (DefinitionDecodingException e) {
// Do nothing.
} catch (ManagedObjectDecodingException e) {
@@ -1177,10 +1176,6 @@
LocalizableMessage pufn = path.getManagedObjectDefinition().getUserFriendlyName();
LocalizableMessage msg = ERR_DSCFG_ERROR_GET_PARENT_MODE.get(pufn);
throw new ClientException(ReturnCode.OTHER, msg, e);
- } catch (CommunicationException e) {
- LocalizableMessage msg = ERR_DSCFG_ERROR_CREATE_CE.get(ufn, e
- .getMessage());
- throw new ClientException(ReturnCode.CLIENT_SIDE_SERVER_DOWN, msg);
} catch (ConcurrentModificationException e) {
LocalizableMessage msg = ERR_DSCFG_ERROR_CREATE_CME.get(ufn);
throw new ClientException(ReturnCode.CONSTRAINT_VIOLATION, msg);
--
Gitblit v1.10.0