diff options
author | Endi S. Dewata <edewata@redhat.com> | 2014-08-28 22:13:26 -0400 |
---|---|---|
committer | Endi S. Dewata <edewata@redhat.com> | 2014-08-28 22:57:37 -0400 |
commit | 1c78b740b1d0a12026b978cf4f2c4f714626ac58 (patch) | |
tree | 7acd5f161506e654bfbe1fa9cea190bbaa62ca1e /base/java-tools/src/com/netscape | |
parent | 2f7e6de6c489a49f7a7be473e5752ef49472bbcc (diff) | |
download | pki-1c78b740b1d0a12026b978cf4f2c4f714626ac58.tar.gz pki-1c78b740b1d0a12026b978cf4f2c4f714626ac58.tar.xz pki-1c78b740b1d0a12026b978cf4f2c4f714626ac58.zip |
Fixed NPE in client-cert-import.
The client-cert-import command has been modified to propertly
initialize the CLI environment to avoid a null pointer exception.
Ticket #1126
Diffstat (limited to 'base/java-tools/src/com/netscape')
-rw-r--r-- | base/java-tools/src/com/netscape/cmstools/cli/MainCLI.java | 2 | ||||
-rw-r--r-- | base/java-tools/src/com/netscape/cmstools/client/ClientCertImportCLI.java | 9 |
2 files changed, 8 insertions, 3 deletions
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 186c9827e..e7097e8ca 100644 --- a/base/java-tools/src/com/netscape/cmstools/cli/MainCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/cli/MainCLI.java @@ -489,7 +489,7 @@ public class MainCLI extends CLI { System.out.println(); } - // Do not call CryptoManager.initialize() on client-init + // Do not call CryptoManager.initialize() on client-init and client-cert-import // because otherwise the database will be locked. String command = cmdArgs[0]; if (!command.equals("client-init") && !command.equals("client-cert-import")) { diff --git a/base/java-tools/src/com/netscape/cmstools/client/ClientCertImportCLI.java b/base/java-tools/src/com/netscape/cmstools/client/ClientCertImportCLI.java index e5b07b3e8..90e3d0a3e 100644 --- a/base/java-tools/src/com/netscape/cmstools/client/ClientCertImportCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/client/ClientCertImportCLI.java @@ -87,8 +87,6 @@ public class ClientCertImportCLI extends CLI { System.exit(-1); } - client = parent.getClient(); - byte[] bytes = null; String certPath = cmd.getOptionValue("cert"); @@ -110,7 +108,14 @@ public class ClientCertImportCLI extends CLI { isCACert = true; } else if (importFromCAServer) { + + // late initialization + MainCLI mainCLI = (MainCLI)parent.parent; + mainCLI.init(); + + client = mainCLI.getClient(); ClientConfig config = client.getConfig(); + String caServerURI = "http://" + config.getServerURI().getHost() + ":8080/ca"; if (verbose) System.out.println("Downloading CA certificate from " + caServerURI + "."); |