From a12eb578b2b06f6ba9d929f4a2c7b81e13eae7cc Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 01 Jul 2016 14:30:12 +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/admin/ads/util/PreferredConnection.java | 16 +---------------
1 files changed, 1 insertions(+), 15 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/admin/ads/util/PreferredConnection.java b/opendj-server-legacy/src/main/java/org/opends/admin/ads/util/PreferredConnection.java
index 9337132..8402809 100644
--- a/opendj-server-legacy/src/main/java/org/opends/admin/ads/util/PreferredConnection.java
+++ b/opendj-server-legacy/src/main/java/org/opends/admin/ads/util/PreferredConnection.java
@@ -99,21 +99,7 @@
*/
private static PreferredConnection getPreferredConnection(ConnectionWrapper conn)
{
- String ldapUrl = conn.getLdapUrl();
- PreferredConnection.Type type;
- if (conn.isStartTLS())
- {
- type = PreferredConnection.Type.START_TLS;
- }
- else if (conn.isSSL())
- {
- type = PreferredConnection.Type.LDAPS;
- }
- else
- {
- type = PreferredConnection.Type.LDAP;
- }
- return new PreferredConnection(ldapUrl, type);
+ return new PreferredConnection(conn.getLdapUrl(), conn.getConnectionType());
}
/**
--
Gitblit v1.10.0