From 37eafc118d988c7635f02b3c9cb0187f3af7c60a Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 05 Apr 2016 09:45:19 +0000
Subject: [PATCH] OPENDJ-2819 Setup error (NPE)
---
opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/Installer.java | 35 +++++++----------------------------
1 files changed, 7 insertions(+), 28 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/Installer.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/Installer.java
index 4f93d32..fa11e05 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/Installer.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/Installer.java
@@ -123,6 +123,7 @@
import org.opends.server.tools.BackendTypeHelper.BackendTypeUIAdapter;
import org.opends.server.types.HostPort;
import org.opends.server.util.CertificateManager;
+import org.opends.server.util.CollectionUtils;
import org.opends.server.util.DynamicConstants;
import org.opends.server.util.SetupUtils;
import org.opends.server.util.StaticUtils;
@@ -210,9 +211,6 @@
private boolean createdRemoteAds;
private String lastImportProgress;
- /** A static String that contains the class name of ConfigFileHandler. */
- protected static final String DEFAULT_CONFIG_CLASS_NAME = "org.opends.server.extensions.ConfigFileHandler";
-
/** Aliases of self-signed certificates. */
protected static final String SELF_SIGNED_CERT_ALIASES[] = new String[] {
SecurityOptions.SELF_SIGNED_CERT_ALIAS,
@@ -823,18 +821,11 @@
writeHostName();
checkAbort();
- List<String> argList = new ArrayList<>();
- argList.add("-C");
- argList.add(getConfigurationClassName());
-
- argList.add("-c");
- argList.add(getConfigurationFile());
- argList.add("-h");
- argList.add(getUserData().getHostName());
- argList.add("-p");
- argList.add(String.valueOf(getUserData().getServerPort()));
- argList.add("--adminConnectorPort");
- argList.add(String.valueOf(getUserData().getAdminConnectorPort()));
+ List<String> argList = CollectionUtils.newArrayList(
+ "-c", getConfigurationFile(),
+ "-h", getUserData().getHostName(),
+ "-p", String.valueOf(getUserData().getServerPort()),
+ "--adminConnectorPort", String.valueOf(getUserData().getAdminConnectorPort()));
final SecurityOptions sec = getUserData().getSecurityOptions();
// TODO: even if the user does not configure SSL maybe we should choose
@@ -2966,7 +2957,7 @@
if (errorMsgs.isEmpty())
{
AuthenticationData auth = new AuthenticationData();
- auth.setHostPort(new HostPort(host, port != null ? port : 0));
+ auth.setHostPort(new HostPort("".equals(host) ? null : host, port != null ? port : 0));
auth.setDn(dn);
auth.setPwd(pwd);
auth.setUseSecureConnection(true);
@@ -4143,18 +4134,6 @@
return getPath(getInstallation().getCurrentConfigurationFile());
}
- /**
- * Returns the configuration class name to be used when invoking the
- * command-lines.
- *
- * @return the configuration class name to be used when invoking the
- * command-lines.
- */
- private String getConfigurationClassName()
- {
- return DEFAULT_CONFIG_CLASS_NAME;
- }
-
private String getLocalReplicationServer()
{
return getUserData().getHostName() + ":" + getUserData().getReplicationOptions().getReplicationPort();
--
Gitblit v1.10.0