diff options
Diffstat (limited to 'base/java-tools/src')
3 files changed, 14 insertions, 5 deletions
diff --git a/base/java-tools/src/com/netscape/cmstools/feature/FeatureCLI.java b/base/java-tools/src/com/netscape/cmstools/feature/FeatureCLI.java index 41c01df8e..6e6d6a404 100644 --- a/base/java-tools/src/com/netscape/cmstools/feature/FeatureCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/feature/FeatureCLI.java @@ -17,6 +17,7 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cmstools.feature; +import com.netscape.certsrv.client.PKIClient; import com.netscape.certsrv.system.Feature; import com.netscape.certsrv.system.FeatureClient; import com.netscape.cmstools.cli.CLI; @@ -42,10 +43,14 @@ public class FeatureCLI extends CLI { } } - public void execute(String[] args) throws Exception { - client = parent.getClient(); + public FeatureClient getFeatureClient() throws Exception { + + if (featureClient != null) return featureClient; + + PKIClient client = getClient(); featureClient = new FeatureClient(client, "ca"); - super.execute(args); + + return featureClient; } protected static void printFeature(Feature data) { diff --git a/base/java-tools/src/com/netscape/cmstools/feature/FeatureFindCLI.java b/base/java-tools/src/com/netscape/cmstools/feature/FeatureFindCLI.java index 72f22ec71..9e2ea6243 100644 --- a/base/java-tools/src/com/netscape/cmstools/feature/FeatureFindCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/feature/FeatureFindCLI.java @@ -23,6 +23,7 @@ import java.util.List; import org.apache.commons.cli.CommandLine; import com.netscape.certsrv.system.Feature; +import com.netscape.certsrv.system.FeatureClient; import com.netscape.cmstools.cli.CLI; import com.netscape.cmstools.cli.MainCLI; @@ -49,7 +50,8 @@ public class FeatureFindCLI extends CLI { @SuppressWarnings("unused") CommandLine cmd = parser.parse(options, args); - List<Feature> features = featureCLI.featureClient.listFeatures(); + FeatureClient featureClient = featureCLI.getFeatureClient(); + List<Feature> features = featureClient.listFeatures(); MainCLI.printMessage(features.size() + " entries matched"); if (features.size() == 0) return; diff --git a/base/java-tools/src/com/netscape/cmstools/feature/FeatureShowCLI.java b/base/java-tools/src/com/netscape/cmstools/feature/FeatureShowCLI.java index 7eda79951..d7c285872 100644 --- a/base/java-tools/src/com/netscape/cmstools/feature/FeatureShowCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/feature/FeatureShowCLI.java @@ -22,6 +22,7 @@ import java.util.Arrays; import org.apache.commons.cli.CommandLine; import com.netscape.certsrv.system.Feature; +import com.netscape.certsrv.system.FeatureClient; import com.netscape.cmstools.cli.CLI; public class FeatureShowCLI extends CLI { @@ -58,7 +59,8 @@ public class FeatureShowCLI extends CLI { String featureID = cmdArgs[0]; - Feature data = featureCLI.featureClient.getFeature(featureID); + FeatureClient featureClient = featureCLI.getFeatureClient(); + Feature data = featureClient.getFeature(featureID); FeatureCLI.printFeature(data); } |