Refactored SecurityDomainCLI.

The SecurityDomainCLI and its submodule have been modified to use
lazy initialization to get the PKIClient object.

2 files changed, 9 insertions, 4 deletions

diff --git a/base/java-tools/src/com/netscape/cmstools/system/SecurityDomainCLI.java b/base/java-tools/src/com/netscape/cmstools/system/SecurityDomainCLI.java
index 0c2ed37d8..d9db91eb9 100644
--- a/base/java-tools/src/com/netscape/cmstools/system/SecurityDomainCLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/system/SecurityDomainCLI.java
@@ -18,6 +18,7 @@
 
 package com.netscape.cmstools.system;
 
+import com.netscape.certsrv.client.PKIClient;
 import com.netscape.certsrv.system.DomainInfo;
 import com.netscape.certsrv.system.SecurityDomainClient;
 import com.netscape.certsrv.system.SecurityDomainHost;
@@ -52,9 +53,11 @@ public class SecurityDomainCLI extends CLI {
         return "pki-securitydomain";
     }
 
-    public void execute(String[] args) throws Exception {
+    public SecurityDomainClient getSecurityDomainClient() throws Exception {
 
-        client = parent.getClient();
+        if (securityDomainClient != null) return securityDomainClient;
+
+        PKIClient client = getClient();
 
         // determine the subsystem
         String subsystem = client.getSubsystem();
@@ -63,7 +66,7 @@ public class SecurityDomainCLI extends CLI {
         // create new security domain client
         securityDomainClient = new SecurityDomainClient(client, subsystem);
 
-        super.execute(args);
+        return securityDomainClient;
     }
 
     public static void printSecurityDomain(DomainInfo domain) {
diff --git a/base/java-tools/src/com/netscape/cmstools/system/SecurityDomainShowCLI.java b/base/java-tools/src/com/netscape/cmstools/system/SecurityDomainShowCLI.java
index 14d8e6685..f4082ef4e 100644
--- a/base/java-tools/src/com/netscape/cmstools/system/SecurityDomainShowCLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/system/SecurityDomainShowCLI.java
@@ -23,6 +23,7 @@ import java.util.Arrays;
 import org.apache.commons.cli.CommandLine;
 
 import com.netscape.certsrv.system.DomainInfo;
+import com.netscape.certsrv.system.SecurityDomainClient;
 import com.netscape.cmstools.cli.CLI;
 
 /**
@@ -56,7 +57,8 @@ public class SecurityDomainShowCLI extends CLI {
             throw new Exception("Too many arguments specified.");
         }
 
-        DomainInfo domain = securityDomainCLI.securityDomainClient.getDomainInfo();
+        SecurityDomainClient securityDomainClient = securityDomainCLI.getSecurityDomainClient();
+        DomainInfo domain = securityDomainClient.getDomainInfo();
 
         SecurityDomainCLI.printSecurityDomain(domain);
     }