From a3c93828f847345ed67fda0cddf1089d8fb433d5 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 07 Mar 2016 15:04:03 +0000
Subject: [PATCH] OPENDJ-1342 Migrate AVA, RDN, and DN classes: DirectoryException => LocalizedIllegalArgumentException
---
opendj-server-legacy/src/main/java/org/opends/server/tools/ConfigureDS.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/ConfigureDS.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/ConfigureDS.java
index 849cb72..56979fa 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/ConfigureDS.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/ConfigureDS.java
@@ -46,7 +46,9 @@
import javax.crypto.Cipher;
import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.i18n.LocalizedIllegalArgumentException;
import org.forgerock.opendj.config.ManagedObjectDefinition;
+import org.forgerock.opendj.ldap.DN;
import org.forgerock.opendj.server.config.client.BackendCfgClient;
import org.forgerock.opendj.server.config.server.BackendCfg;
import org.opends.quicksetup.installer.Installer;
@@ -65,7 +67,6 @@
import org.opends.server.extensions.ConfigFileHandler;
import org.opends.server.extensions.SaltedSHA512PasswordStorageScheme;
import org.opends.server.protocols.ldap.LDAPResultCode;
-import org.forgerock.opendj.ldap.DN;
import org.opends.server.types.DirectoryEnvironmentConfig;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.Entry;
@@ -648,11 +649,11 @@
{
rootDN = DN.valueOf(rootDNString.getValue());
}
- catch (final DirectoryException de)
+ catch (final LocalizedIllegalArgumentException e)
{
final LocalizableMessage msg = ERR_CONFIGDS_CANNOT_PARSE_ROOT_DN.get(
- rootDNString.getValue(), de.getMessageObject());
- throw new ConfigureDSException(de, msg);
+ rootDNString.getValue(), e.getMessageObject());
+ throw new ConfigureDSException(e, msg);
}
}
return rootDN;
@@ -691,14 +692,14 @@
dn = DN.valueOf(trustManagerProviderDN.getValue());
JCEKSManagerDN = DN.valueOf(jckesDN);
}
- catch (final DirectoryException de)
+ catch (final LocalizedIllegalArgumentException e)
{
final String value = trustManagerProviderDN.getValue();
- final LocalizableMessage errorMessage = de.getMessageObject();
+ final LocalizableMessage errorMessage = e.getMessageObject();
final LocalizableMessage message =
isKeyManager ? ERR_CONFIGDS_CANNOT_PARSE_KEYMANAGER_PROVIDER_DN.get(value, errorMessage)
: ERR_CONFIGDS_CANNOT_PARSE_TRUSTMANAGER_PROVIDER_DN.get(value, errorMessage);
- throw new ConfigureDSException(de, message);
+ throw new ConfigureDSException(e, message);
}
if (dn.equals(JCEKSManagerDN))
--
Gitblit v1.10.0