From 92ca37b3ae4ee03b8319a1f5586b9bffd8d73f81 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 07 Apr 2016 20:05:24 +0000
Subject: [PATCH] OPENDJ-2822 Enabling replication throws a NPE OPENDJ-2821 status tool throws an exception with -X option
---
opendj-server-legacy/src/main/java/org/opends/admin/ads/util/ConnectionWrapper.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/admin/ads/util/ConnectionWrapper.java b/opendj-server-legacy/src/main/java/org/opends/admin/ads/util/ConnectionWrapper.java
index 14407f8..07ebac6 100644
--- a/opendj-server-legacy/src/main/java/org/opends/admin/ads/util/ConnectionWrapper.java
+++ b/opendj-server-legacy/src/main/java/org/opends/admin/ads/util/ConnectionWrapper.java
@@ -134,7 +134,9 @@
{
try
{
- return new SSLContextBuilder().setTrustManager(trustManager).getSSLContext();
+ return new SSLContextBuilder()
+ .setTrustManager(trustManager != null ? trustManager : new BlindTrustManager())
+ .getSSLContext();
}
catch (GeneralSecurityException e)
{
--
Gitblit v1.10.0