From 466627bf6d29a84a71825af598b7772f64f4b67b Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Tue, 12 Feb 2008 02:14:18 +0000
Subject: [PATCH] Fix for issue 2923 (setup : nullpointer exception for null value on key store pin)
---
opendj-sdk/opends/src/server/org/opends/server/tools/InstallDS.java | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/InstallDS.java b/opendj-sdk/opends/src/server/org/opends/server/tools/InstallDS.java
index e1eac61..2ff4c87 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/InstallDS.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/InstallDS.java
@@ -1622,7 +1622,18 @@
errorWithPath = true;
}
}
- if (!errorWithPath)
+ boolean pwdProvided = true;
+ if (pwd == null)
+ {
+ pwdProvided = false;
+ errorMessages.add(INFO_ERROR_NO_KEYSTORE_PASSWORD.get());
+ }
+ else if (pwd.length() == 0)
+ {
+ pwdProvided = false;
+ errorMessages.add(INFO_ERROR_EMPTY_KEYSTORE_PASSWORD.get());
+ }
+ if (!errorWithPath && pwdProvided)
{
try
{
@@ -1927,7 +1938,9 @@
msg.getDescriptor().equals(INFO_PKCS11_KEYSTORE_DOES_NOT_EXIST) ||
msg.getDescriptor().equals(INFO_ERROR_ACCESSING_JKS_KEYSTORE) ||
msg.getDescriptor().equals(INFO_ERROR_ACCESSING_PKCS12_KEYSTORE) ||
- msg.getDescriptor().equals(INFO_ERROR_ACCESSING_PKCS11_KEYSTORE))
+ msg.getDescriptor().equals(INFO_ERROR_ACCESSING_PKCS11_KEYSTORE) ||
+ msg.getDescriptor().equals(INFO_ERROR_NO_KEYSTORE_PASSWORD) ||
+ msg.getDescriptor().equals(INFO_ERROR_EMPTY_KEYSTORE_PASSWORD))
{
found = true;
break;
--
Gitblit v1.10.0