From f7940c5ab77e97f3df1eaa2cf27a2877a4f9593e Mon Sep 17 00:00:00 2001
From: Fabio Pistolesi <fabio.pistolesi@forgerock.com>
Date: Fri, 08 Apr 2016 15:20:27 +0000
Subject: [PATCH] OPENDJ-2829 dsreplication status throws a NPE when the server is not running
---
opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/ReplicationCliMain.java | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/ReplicationCliMain.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/ReplicationCliMain.java
index 0995a1d..1cb09b8 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/ReplicationCliMain.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/ReplicationCliMain.java
@@ -1599,14 +1599,17 @@
{
try
{
- return new ConnectionWrapper(createAdministrativeContext(uData, bindDn),
- getConnectTimeout(), getTrustManager(sourceServerCI));
+ InitialLdapContext ctx = createAdministrativeContext(uData, bindDn);
+ if (ctx != null)
+ {
+ return new ConnectionWrapper(ctx, getConnectTimeout(), getTrustManager(sourceServerCI));
+ }
}
catch (NamingException e)
{
logger.error(LocalizableMessage.raw("Error when creating connection for:" + uData.getHostPort()));
- return null;
}
+ return null;
}
private InitialLdapContext createAdministrativeContext(MonoServerReplicationUserData uData, final String bindDn)
@@ -4176,14 +4179,17 @@
{
try
{
- return new ConnectionWrapper(createAdministrativeContext(server, errorMessages),
- getConnectTimeout(), getTrustManager(sourceServerCI));
+ InitialLdapContext ctx = createAdministrativeContext(server, errorMessages);
+ if (ctx != null)
+ {
+ return new ConnectionWrapper(ctx, getConnectTimeout(), getTrustManager(sourceServerCI));
+ }
}
catch (NamingException e)
{
logger.error(LocalizableMessage.raw("Error when creating connection for:" + server.getHostPort()));
- return null;
}
+ return null;
}
private InitialLdapContext createAdministrativeContext(EnableReplicationServerData server,
--
Gitblit v1.10.0