From 3011f14673b669dc68cc54772f956dc255724d77 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 04 Aug 2016 15:32:20 +0000
Subject: [PATCH] OPENDJ-3235 Replication: NPE when disabling replication on cn=schema
---
opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/ReplicationCliMain.java | 8 +++-----
1 files changed, 3 insertions(+), 5 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 5a3947e..9c908bf 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
@@ -292,7 +292,7 @@
* @return whether the current task should continue
*/
boolean confirmOperation(SourceDestinationServerUserData uData, ConnectionWrapper connSource,
- ConnectionWrapper connDestination, final boolean defaultValue);
+ ConnectionWrapper connDestination, boolean defaultValue);
}
/** The argument parser to be used. */
@@ -2690,7 +2690,6 @@
try
{
-
List<DN> suffixes = toDNs(argParser.getBaseDNs());
checkSuffixesForInitializeReplication(suffixes, conn, true);
if (suffixes.isEmpty())
@@ -3095,7 +3094,8 @@
{
uData.setBaseDNs(toDNs(argParser.getBaseDNs()));
String adminUid = argParser.getAdministratorUID();
- DN bindDn = DN.valueOf(argParser.getBindDNToDisable());
+ String bindDnStr = argParser.getBindDNToDisable();
+ DN bindDn = bindDnStr != null ? DN.valueOf(bindDnStr) : null;
if (bindDn == null && adminUid == null)
{
adminUid = argParser.getAdministratorUIDOrDefault();
@@ -5680,7 +5680,6 @@
}
}
-
boolean somethingDisplayed = false;
if (!oneReplicated && displayAll)
{
@@ -6253,7 +6252,6 @@
print(formatter.getFormattedWithPoints(
INFO_REPLICATION_ENABLE_CONFIGURING_REPLICATION_SERVER.get(conn.getHostPort())));
-
/* Configure Synchronization plugin. */
ReplicationSynchronizationProviderCfgClient sync = null;
try
--
Gitblit v1.10.0