From 433e1dba905f9d45f9eefcbf39e5b11ddfbfbc94 Mon Sep 17 00:00:00 2001 From: "Endi S. Dewata" Date: Thu, 2 Jul 2015 18:33:48 -0400 Subject: Fixed NPE in key-archive CLI. The pki CLI has been modified such that if the security database location (-d) is not specified, the config.certDatabase will be initialized with the default value (i.e. ~/.dogtag/nssdb). The config.certDatabase is needed by the CLI to prepare the client library for key archival operations. --- .../src/com/netscape/cmstools/cli/MainCLI.java | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) (limited to 'base/java-tools/src/com/netscape/cmstools/cli') diff --git a/base/java-tools/src/com/netscape/cmstools/cli/MainCLI.java b/base/java-tools/src/com/netscape/cmstools/cli/MainCLI.java index 77245ec53..4d63d9bc1 100644 --- a/base/java-tools/src/com/netscape/cmstools/cli/MainCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/cli/MainCLI.java @@ -330,9 +330,14 @@ public class MainCLI extends CLI { } } - // store security database path - if (certDatabase != null) + if (certDatabase != null) { + // store user-provided security database location config.setCertDatabase(new File(certDatabase).getAbsolutePath()); + } else { + // store default security database location + config.setCertDatabase(System.getProperty("user.home") + + File.separator + ".dogtag" + File.separator + "nssdb"); + } // store token name config.setTokenName(tokenName); @@ -395,17 +400,7 @@ public class MainCLI extends CLI { list = cmd.getOptionValue("ignore-cert-status"); convertCertStatusList(list, ignoredCertStatuses); - if (config.getCertDatabase() == null) { - // Use default client security database - this.certDatabase = new File( - System.getProperty("user.home") + File.separator + - ".dogtag" + File.separator + "nssdb"); - - } else { - // Use existing client security database - this.certDatabase = new File(config.getCertDatabase()); - } - + this.certDatabase = new File(config.getCertDatabase()); if (verbose) System.out.println("Client security database: "+this.certDatabase.getAbsolutePath()); String messageFormat = cmd.getOptionValue("message-format"); -- cgit