From 766ba6b28669b54a6a90c539822661690cf5fa2d Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Wed, 25 Nov 2009 20:42:49 +0000
Subject: [PATCH] Fix for issue 4371 (setup throws NullPointerException when trying to use a PKCS12 certificate) Handle the case where the user provides a certificate without an alias. The code in CertificateManager has been updated to detect this situation. The code in ConfigureDS has also been updated to handle the case where the user does not provide a certificate nickname.
---
opends/src/quicksetup/org/opends/quicksetup/SecurityOptions.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/opends/src/quicksetup/org/opends/quicksetup/SecurityOptions.java b/opends/src/quicksetup/org/opends/quicksetup/SecurityOptions.java
index b60f777..23b445f 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/SecurityOptions.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/SecurityOptions.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2006-2008 Sun Microsystems, Inc.
+ * Copyright 2006-2009 Sun Microsystems, Inc.
*/
package org.opends.quicksetup;
@@ -117,7 +117,7 @@
* @param enableSSL whether SSL is enabled or not.
* @param enableStartTLS whether Start TLS is enabled or not.
* @param sslPort the value of the LDAPS port.
- * @param aliasToUse the alias of the certificate in the keystore to be used.
+ * @param aliasToUse the alias of the certificate in the key store to be used.
* @return a new instance of a SecurityOptions using a Java Key Store.
*/
public static SecurityOptions createJKSCertificateOptions(String keystorePath,
@@ -335,8 +335,8 @@
}
/**
- * Returns the alias of the certificate in the keystore to be used.
- * @return the alias of the certificate in the keystore to be used.
+ * Returns the alias of the certificate in the key store to be used.
+ * @return the alias of the certificate in the key store to be used.
*/
public String getAliasToUse()
{
--
Gitblit v1.10.0