From faa437e27dbc2d719e4ee489fa3449b5ca49db97 Mon Sep 17 00:00:00 2001
From: lutoff <lutoff@localhost>
Date: Thu, 02 Aug 2007 08:25:19 +0000
Subject: [PATCH] Code cleaning
---
opends/src/server/org/opends/server/admin/client/cli/DsFrameworkCliParser.java | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/opends/src/server/org/opends/server/admin/client/cli/DsFrameworkCliParser.java b/opends/src/server/org/opends/server/admin/client/cli/DsFrameworkCliParser.java
index af7546e..877ea67 100644
--- a/opends/src/server/org/opends/server/admin/client/cli/DsFrameworkCliParser.java
+++ b/opends/src/server/org/opends/server/admin/client/cli/DsFrameworkCliParser.java
@@ -682,7 +682,8 @@
public KeyManager getKeyManager()
{
KeyStore keyStore = null;
- String keyStorePasswordValue = null;
+ String keyStorePasswordStringValue = null;
+ char[] keyStorePasswordValue = null;
if (keyStorePathArg.isPresent())
{
try
@@ -690,14 +691,20 @@
FileInputStream fos = new FileInputStream(keyStorePathArg.getValue());
if (keyStorePasswordArg.isPresent())
{
- keyStorePasswordValue = keyStorePasswordArg.getValue();
+ keyStorePasswordStringValue = keyStorePasswordArg.getValue();
}
else if (keyStorePasswordFileArg.isPresent())
{
- keyStorePasswordValue = keyStorePasswordFileArg.getValue();
+ keyStorePasswordStringValue = keyStorePasswordFileArg.getValue();
}
+ if (keyStorePasswordStringValue != null)
+ {
+ keyStorePasswordValue = keyStorePasswordStringValue.toCharArray();
+ }
+
keyStore = KeyStore.getInstance(KeyStore.getDefaultType());
- keyStore.load(fos, keyStorePasswordValue.toCharArray());
+ keyStore.load(fos,keyStorePasswordValue);
+ fos.close();
}
catch (KeyStoreException e)
{
@@ -734,8 +741,12 @@
// in a best effort mode.
LOG.log(Level.WARNING, "Error with the keystore", e);
}
- ApplicationKeyManager akm = new ApplicationKeyManager(keyStore,
- keyStorePasswordValue.toCharArray());
+ char[] password = null;
+ if (keyStorePasswordStringValue != null)
+ {
+ password = keyStorePasswordStringValue.toCharArray();
+ }
+ ApplicationKeyManager akm = new ApplicationKeyManager(keyStore,password);
if (certNicknameArg.isPresent())
{
return new SelectableCertificateKeyManager(akm, certNicknameArg
--
Gitblit v1.10.0