From 609077ed606e3b094e303f298e8dca10567bc3e2 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 05 Aug 2016 18:42:07 +0000
Subject: [PATCH] Partial OPENDJ-2625 Convert all code that uses JNDI to use the SDK instead
---
opendj-server-legacy/src/main/java/org/opends/quicksetup/Application.java | 15 ++++++---------
1 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/Application.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/Application.java
index c2c56a3..53bcf6a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/Application.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/Application.java
@@ -25,13 +25,12 @@
import java.util.Map;
import java.util.Set;
-import javax.naming.NamingException;
-
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.LocalizableMessageBuilder;
import org.forgerock.i18n.LocalizableMessageDescriptor.Arg2;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.ldap.DN;
+import org.forgerock.opendj.ldap.LdapException;
import org.opends.admin.ads.ADSContext;
import org.opends.admin.ads.ServerDescriptor;
import org.opends.admin.ads.TopologyCacheException;
@@ -613,20 +612,18 @@
filter.setSearchBaseDNInformation(false);
ServerLoader loader = new ServerLoader(adsProperties, dn, pwd, getTrustManager(), timeout, cnx, filter);
- ConnectionWrapper connection;
try
{
- connection = loader.createConnectionWrapper();
+ return loader.createConnectionWrapper();
}
- catch (NamingException ne)
+ catch (LdapException e)
{
- Arg2<Object, Object> arg2 = isCertificateException(ne)
+ Arg2<Object, Object> arg2 = isCertificateException(e)
? INFO_ERROR_READING_CONFIG_LDAP_CERTIFICATE_SERVER
: INFO_CANNOT_CONNECT_TO_REMOTE_GENERIC;
- LocalizableMessage msg = arg2.get(server.getHostPort(true), ne.toString(true));
- throw new ApplicationException(ReturnCode.CONFIGURATION_ERROR, msg, ne);
+ LocalizableMessage msg = arg2.get(server.getHostPort(true), e.getLocalizedMessage());
+ throw new ApplicationException(ReturnCode.CONFIGURATION_ERROR, msg, e);
}
- return connection;
}
/**
--
Gitblit v1.10.0