From 0f88b78b378ac39f0c9ad5d2926404497d5bf4c9 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 05 Aug 2016 19:04:23 +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/guitools/controlpanel/ui/LoginPanel.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/LoginPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/LoginPanel.java
index a47b467..fc488d2 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/LoginPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/LoginPanel.java
@@ -22,7 +22,6 @@
import java.util.Iterator;
import java.util.LinkedHashSet;
-import javax.naming.NamingException;
import javax.swing.JLabel;
import javax.swing.JPasswordField;
import javax.swing.JTextField;
@@ -31,6 +30,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.ldap.DN;
+import org.forgerock.opendj.ldap.LdapException;
import org.opends.admin.ads.util.ApplicationTrustManager;
import org.opends.admin.ads.util.ConnectionWrapper;
import org.opends.guitools.controlpanel.datamodel.ConfigReadException;
@@ -265,7 +265,7 @@
handleCertificateException = true;
}
}
- else if (throwable instanceof NamingException)
+ else if (throwable instanceof LdapException)
{
boolean found = false;
String providedDn = dn.getText();
@@ -273,7 +273,7 @@
getAdministrativeUsers().iterator();
while (it.hasNext() && !found)
{
- found = Utils.areDnsEqual(providedDn, it.next().toString());
+ found = DN.valueOf(providedDn).equals(it.next());
}
if (!found)
{
@@ -281,8 +281,7 @@
}
else
{
- errors.add(Utils.getMessageForException(
- (NamingException)throwable));
+ errors.add(Utils.getMessageForException((LdapException) throwable));
}
setPrimaryInvalid(dnLabel);
--
Gitblit v1.10.0