From d219cba0ae3f8b69e5f68eb542974f0319304803 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 22 Jun 2016 07:16:45 +0000
Subject: [PATCH] OPENDJ-3095 Upgrade: uninstallation of replicated server throws a NPE
---
opendj-server-legacy/src/main/java/org/opends/admin/ads/util/ConnectionUtils.java | 6 +-----
1 files changed, 1 insertions(+), 5 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 8b7052e..74ac345 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
@@ -176,13 +176,9 @@
env.put("java.naming.ldap.factory.socket",
org.opends.admin.ads.util.TrustedSocketFactory.class.getName());
- if (dn != null)
+ if (dn != null && pwd != null)
{
env.put(Context.SECURITY_PRINCIPAL, dn);
- }
-
- if (pwd != null)
- {
env.put(Context.SECURITY_CREDENTIALS, pwd);
}
--
Gitblit v1.10.0