From f30a6f83f509fc5ca3332bbf4cd032163870a35f Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Tue, 12 May 2015 13:29:50 +0000
Subject: [PATCH] OPENDJ-2011 OPENDJ-2008 OPENDJ-1979 Bug fixes
---
opendj-sdk/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/Utils.java | 29 ++++++++++++++++++-----------
opendj-sdk/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/Installer.java | 9 +++++++--
2 files changed, 25 insertions(+), 13 deletions(-)
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/Installer.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/Installer.java
index 789f6a2..77932c1 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/Installer.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/Installer.java
@@ -876,8 +876,13 @@
argList.add("-w");
argList.add(getUserData().getDirectoryManagerPwd());
- argList.add("--" + OPTION_LONG_BACKEND_TYPE);
- argList.add(BackendTypeHelper.filterSchemaBackendName(getUserData().getBackendType().getName()));
+ final ManagedObjectDefinition<? extends BackendCfgClient, ? extends BackendCfg> backendType =
+ getUserData().getBackendType();
+ if (backendType != null)
+ {
+ argList.add("--" + OPTION_LONG_BACKEND_TYPE);
+ argList.add(BackendTypeHelper.filterSchemaBackendName(backendType.getName()));
+ }
if (createNotReplicatedSuffix())
{
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/Utils.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/Utils.java
index a20ffd5..3f7fa3e 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/Utils.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/Utils.java
@@ -77,6 +77,9 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.LocalizableMessageBuilder;
import org.forgerock.i18n.slf4j.LocalizedLogger;
+import org.forgerock.opendj.config.ManagedObjectDefinition;
+import org.forgerock.opendj.server.config.client.BackendCfgClient;
+import org.forgerock.opendj.server.config.server.BackendCfg;
import org.opends.admin.ads.ADSContext;
import org.opends.admin.ads.ReplicaDescriptor;
import org.opends.admin.ads.ServerDescriptor;
@@ -1504,7 +1507,6 @@
final DataReplicationOptions repl = userInstallData.getReplicationOptions();
final SuffixesToReplicateOptions suf = userInstallData.getSuffixesToReplicateOptions();
- final String backendType = userInstallData.getBackendType().getUserFriendlyName().toString();
boolean createSuffix = repl.getType() == DataReplicationOptions.Type.FIRST_IN_TOPOLOGY
|| repl.getType() == DataReplicationOptions.Type.STANDALONE
@@ -1541,14 +1543,18 @@
{
msg = INFO_REVIEW_CREATE_NO_SUFFIX.get();
}
- else if (options.getBaseDns().size() > 1)
- {
- msg = INFO_REVIEW_CREATE_SUFFIX.get(
- backendType, joinAsString(Constants.LINE_SEPARATOR, options.getBaseDns()), arg2);
- }
else
{
- msg = INFO_REVIEW_CREATE_SUFFIX.get(backendType, options.getBaseDns().getFirst(), arg2);
+ final String backendType = userInstallData.getBackendType().getUserFriendlyName().toString();
+ if (options.getBaseDns().size() > 1)
+ {
+ msg = INFO_REVIEW_CREATE_SUFFIX.get(
+ backendType, joinAsString(Constants.LINE_SEPARATOR, options.getBaseDns()), arg2);
+ }
+ else
+ {
+ msg = INFO_REVIEW_CREATE_SUFFIX.get(backendType, options.getBaseDns().getFirst(), arg2);
+ }
}
}
else
@@ -1752,14 +1758,15 @@
cmdLine.add(getInstallDir(userData) + getSetupFilename());
cmdLine.add("--cli");
- final List<String> baseDNs = getBaseDNs(userData);
- if (!baseDNs.isEmpty())
+ final ManagedObjectDefinition<? extends BackendCfgClient, ? extends BackendCfg> backendType =
+ userData.getBackendType();
+ if (backendType != null)
{
cmdLine.add("--" + ArgumentConstants.OPTION_LONG_BACKEND_TYPE);
- cmdLine.add(BackendTypeHelper.filterSchemaBackendName(userData.getBackendType().getName()));
+ cmdLine.add(BackendTypeHelper.filterSchemaBackendName(backendType.getName()));
}
- for (final String baseDN : baseDNs)
+ for (final String baseDN : getBaseDNs(userData))
{
cmdLine.add("--baseDN");
cmdLine.add(baseDN);
--
Gitblit v1.10.0