From ae742dfca9348b17e017d73c82a99d2f0d65d7b2 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 22 Apr 2016 16:38:13 +0000
Subject: [PATCH] TrustedSocketFactory.java: Reverted restraining visibility. InitialLdapContext requires the class and its constructor to be public.
---
opendj-server-legacy/src/main/java/org/opends/admin/ads/util/TrustedSocketFactory.java | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/admin/ads/util/TrustedSocketFactory.java b/opendj-server-legacy/src/main/java/org/opends/admin/ads/util/TrustedSocketFactory.java
index f404a36..3238f63 100644
--- a/opendj-server-legacy/src/main/java/org/opends/admin/ads/util/TrustedSocketFactory.java
+++ b/opendj-server-legacy/src/main/java/org/opends/admin/ads/util/TrustedSocketFactory.java
@@ -30,8 +30,13 @@
import javax.net.ssl.SSLSocketFactory;
import javax.net.ssl.TrustManager;
-/** An implementation of SSLSocketFactory. */
-class TrustedSocketFactory extends SSLSocketFactory
+/**
+ * An implementation of SSLSocketFactory.
+ * <p>
+ * Note: The class must be public so it can be instantiated by the
+ * {@link javax.naming.ldap.InitialLdapContext}.
+ */
+public class TrustedSocketFactory extends SSLSocketFactory
{
private static final Map<Thread, TrustManager> hmTrustManager = new HashMap<>();
private static final Map<Thread, KeyManager> hmKeyManager = new HashMap<>();
@@ -45,10 +50,16 @@
/**
* Constructor of the TrustedSocketFactory.
- * @param trustManager the trust manager to use.
- * @param keyManager the key manager to use.
+ * <p>
+ * Note: The class must be public so it can be instantiated by the
+ * {@link javax.naming.ldap.InitialLdapContext}.
+ *
+ * @param trustManager
+ * the trust manager to use.
+ * @param keyManager
+ * the key manager to use.
*/
- TrustedSocketFactory(TrustManager trustManager, KeyManager keyManager)
+ public TrustedSocketFactory(TrustManager trustManager, KeyManager keyManager)
{
this.trustManager = trustManager;
this.keyManager = keyManager;
--
Gitblit v1.10.0