From 9d81d8ffcf1c38eb511785df36d56ead3e6a4418 Mon Sep 17 00:00:00 2001
From: "Endi S. Dewata" <edewata@redhat.com>
Date: Thu, 23 Mar 2017 22:22:16 +0100
Subject: Refactored CLI.getClient().

The CLI.getClient() has been modified to return the parent CLI's
PKIClient object if available.
---
 base/java-tools/src/com/netscape/cmstools/cli/CLI.java      | 5 +++--
 base/java-tools/src/com/netscape/cmstools/cli/ProxyCLI.java | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'base/java-tools/src/com')

diff --git a/base/java-tools/src/com/netscape/cmstools/cli/CLI.java b/base/java-tools/src/com/netscape/cmstools/cli/CLI.java
index 113c5e040..4911b8ae2 100644
--- a/base/java-tools/src/com/netscape/cmstools/cli/CLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/cli/CLI.java
@@ -190,10 +190,11 @@ public class CLI {
     }
 
     public PKIClient getClient() throws Exception {
-        return client;
+        if (parent != null) return parent.getClient();
+        return null;
     }
 
-    public Object getClient(String name) {
+    public Object getClient(String name) throws Exception {
         if (parent != null) return parent.getClient(name);
         return null;
     }
diff --git a/base/java-tools/src/com/netscape/cmstools/cli/ProxyCLI.java b/base/java-tools/src/com/netscape/cmstools/cli/ProxyCLI.java
index 1cf6feaf2..60d4593d4 100644
--- a/base/java-tools/src/com/netscape/cmstools/cli/ProxyCLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/cli/ProxyCLI.java
@@ -91,7 +91,7 @@ public class ProxyCLI extends CLI {
         return module.getClient();
     }
 
-    public Object getClient(String name) {
+    public Object getClient(String name) throws Exception {
         return module.getClient(name);
     }
 
-- 
cgit