From ed1c23f62597ba2fcf725b480289f95a55b0c1ff Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Fri, 21 Sep 2007 18:09:24 +0000
Subject: [PATCH] Fix for 2320.

---
 opends/src/quicksetup/org/opends/quicksetup/Application.java |   16 ++++++++++++----
 1 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/opends/src/quicksetup/org/opends/quicksetup/Application.java b/opends/src/quicksetup/org/opends/quicksetup/Application.java
index 47e7733..4a38ae3 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/Application.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/Application.java
@@ -719,10 +719,18 @@
     }
     catch (NamingException ne)
     {
-      Message errorMessage = INFO_CANNOT_CONNECT_TO_REMOTE_GENERIC.get(
-          server.getHostPort(true), ne.toString(true));
-      throw new ApplicationException(
-          ReturnCode.CONFIGURATION_ERROR, errorMessage,
+      Message msg;
+      if (Utils.isCertificateException(ne))
+      {
+        msg = INFO_ERROR_READING_CONFIG_LDAP_CERTIFICATE_SERVER.get(
+            server.getHostPort(true), ne.toString(true));
+      }
+      else
+      {
+         msg = INFO_CANNOT_CONNECT_TO_REMOTE_GENERIC.get(
+             server.getHostPort(true), ne.toString(true));
+      }
+      throw new ApplicationException(ReturnCode.CONFIGURATION_ERROR, msg,
           ne);
     }
     return ctx;

--
Gitblit v1.10.0