From c16b8a7b8896914a3ab382fc835aefcf88c81e78 Mon Sep 17 00:00:00 2001
From: Fabio Pistolesi <fabio.pistolesi@forgerock.com>
Date: Fri, 15 May 2015 08:22:09 +0000
Subject: [PATCH] OPENDJ-1980 CR-6915 Cannot enable replication using dsreplication and Persistit
---
opendj-server-legacy/src/main/java/org/opends/server/tools/dsreplication/ReplicationCliMain.java | 34 ++++++++++++++++------------------
1 files changed, 16 insertions(+), 18 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 873c2f6..b71406b 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
@@ -22,7 +22,7 @@
*
*
* Copyright 2007-2010 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS
+ * Portions Copyright 2011-2015 ForgeRock AS
* Portions Copyright 2012 profiq s.r.o.
*/
package org.opends.server.tools.dsreplication;
@@ -1684,17 +1684,16 @@
Collection<String> availableSuffixes, Arg0 noSuffixAvailableMsg,
Arg0 noSuffixSelectedMsg, Arg1<Object> confirmationMsgPromt)
{
+ if (containsOnlySchemaOrAdminSuffix(availableSuffixes))
+ {
+ // In interactive mode we do not propose to manage the administration suffix.
+ println();
+ println(noSuffixAvailableMsg.get());
+ return;
+ }
+
while (suffixes.isEmpty())
{
- if (containsSchemaOrAdminSuffix(availableSuffixes))
- {
- // In interactive mode we do not propose to manage the
- // administration suffix.
- println();
- println(noSuffixAvailableMsg.get());
- break;
- }
-
println();
println(noSuffixSelectedMsg.get());
boolean confirmationLimitReached = askConfirmations(confirmationMsgPromt, availableSuffixes, suffixes);
@@ -1706,16 +1705,16 @@
}
}
- private boolean containsSchemaOrAdminSuffix(Collection<String> suffixes)
+ private boolean containsOnlySchemaOrAdminSuffix(Collection<String> suffixes)
{
for (String suffix : suffixes)
{
- if (isSchemaOrAdminSuffix(suffix))
+ if (!isSchemaOrAdminSuffix(suffix))
{
- return true;
+ return false;
}
}
- return false;
+ return true;
}
private boolean isSchemaOrAdminSuffix(String suffix)
@@ -4687,10 +4686,9 @@
{
while (suffixes.isEmpty())
{
- if (containsSchemaOrAdminSuffix(availableSuffixes))
+ if (containsOnlySchemaOrAdminSuffix(availableSuffixes))
{
- // In interactive mode we do not propose to manage the
- // administration suffix.
+ // In interactive mode we do not propose to manage the administration suffix.
if (displayErrors)
{
println();
@@ -4843,7 +4841,7 @@
while (suffixes.isEmpty())
{
println();
- if (containsSchemaOrAdminSuffix(availableSuffixes))
+ if (containsOnlySchemaOrAdminSuffix(availableSuffixes))
{
// In interactive mode we do not propose to manage the administration suffix.
if (argParser.isInitializeAllReplicationSubcommand())
--
Gitblit v1.10.0