From 6a60952f916a84257b0d2ac585a81fdf98d46c9a Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 03 Aug 2016 09:43:06 +0000
Subject: [PATCH] ConnectionWrapper: isSSL() => isLdaps(), isStartTLS() => isStartTls()
---
opendj-server-legacy/src/main/java/org/opends/admin/ads/util/ConnectionUtils.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/admin/ads/util/ConnectionUtils.java b/opendj-server-legacy/src/main/java/org/opends/admin/ads/util/ConnectionUtils.java
index 1a671d4..d629d91 100644
--- a/opendj-server-legacy/src/main/java/org/opends/admin/ads/util/ConnectionUtils.java
+++ b/opendj-server-legacy/src/main/java/org/opends/admin/ads/util/ConnectionUtils.java
@@ -208,7 +208,7 @@
@Override
public void run() {
try {
- if (conn.isSSL() || conn.isStartTLS())
+ if (conn.isLdaps() || conn.isStartTls())
{
TrustedSocketFactory.setCurrentThreadTrustManager(trustManager, keyManager);
}
@@ -463,25 +463,25 @@
/**
* Returns the LDAP URL for the provided parameters.
* @param hostPort the host name and LDAP port.
- * @param useSSL whether to use SSL or not.
+ * @param useLdaps whether to use LDAPS.
* @return the LDAP URL for the provided parameters.
*/
- public static String getLDAPUrl(HostPort hostPort, boolean useSSL)
+ public static String getLDAPUrl(HostPort hostPort, boolean useLdaps)
{
- return getLDAPUrl(hostPort.getHost(), hostPort.getPort(), useSSL);
+ return getLDAPUrl(hostPort.getHost(), hostPort.getPort(), useLdaps);
}
/**
* Returns the LDAP URL for the provided parameters.
* @param host the host name.
* @param port the LDAP port.
- * @param useSSL whether to use SSL or not.
+ * @param useLdaps whether to use LDAPS.
* @return the LDAP URL for the provided parameters.
*/
- public static String getLDAPUrl(String host, int port, boolean useSSL)
+ public static String getLDAPUrl(String host, int port, boolean useLdaps)
{
host = Utils.getHostNameForLdapUrl(host);
- return (useSSL ? "ldaps://" : "ldap://") + host + ":" + port;
+ return (useLdaps ? "ldaps" : "ldap") + "://" + host + ":" + port;
}
/**
--
Gitblit v1.10.0