From cfb153c8e985ad6f2192d56747fcba8af4df3428 Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Thu, 18 Oct 2007 12:48:52 +0000
Subject: [PATCH] Fix for issue 2465: New - dsreplication -q -X : Java exception

---
 opends/src/ads/org/opends/admin/ads/util/ServerLoader.java |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/opends/src/ads/org/opends/admin/ads/util/ServerLoader.java b/opends/src/ads/org/opends/admin/ads/util/ServerLoader.java
index 6a48647..8ca9732 100644
--- a/opends/src/ads/org/opends/admin/ads/util/ServerLoader.java
+++ b/opends/src/ads/org/opends/admin/ads/util/ServerLoader.java
@@ -236,9 +236,13 @@
   public InitialLdapContext createContext() throws NamingException
   {
     InitialLdapContext ctx = null;
-    trustManager.resetLastRefusedItems();
-    String host = (String)serverProperties.get(ServerProperty.HOST_NAME);
-    trustManager.setHost(host);
+    if (trustManager != null)
+    {
+      trustManager.resetLastRefusedItems();
+
+      String host = (String)serverProperties.get(ServerProperty.HOST_NAME);
+      trustManager.setHost(host);
+    }
     lastLdapUrl = getLdapsUrl(serverProperties);
 
     if (lastLdapUrl == null)

--
Gitblit v1.10.0