summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFraser Tweedale <ftweedal@redhat.com>2016-03-14 09:55:16 +1000
committerFraser Tweedale <ftweedal@redhat.com>2016-03-22 13:50:41 +1000
commit8094b9598a4fb5d2e955a36484d9578c57d7f0e6 (patch)
treed06bdb1cd28c73cdc464db8fab82733ea4c315ac
parentf699daab078f4e327aa065ae6c26be86f9211445 (diff)
downloadpki-8094b9598a4fb5d2e955a36484d9578c57d7f0e6.tar.gz
pki-8094b9598a4fb5d2e955a36484d9578c57d7f0e6.tar.xz
pki-8094b9598a4fb5d2e955a36484d9578c57d7f0e6.zip
Remove unused variables from profile classes
Also drive-by refactor 'createProfileData' to use 'getProfile', reducing code size.
-rw-r--r--base/ca/src/org/dogtagpki/server/ca/rest/ProfileService.java13
-rw-r--r--base/server/cmscore/src/com/netscape/cmscore/profile/ProfileSubsystem.java1
2 files changed, 1 insertions, 13 deletions
diff --git a/base/ca/src/org/dogtagpki/server/ca/rest/ProfileService.java b/base/ca/src/org/dogtagpki/server/ca/rest/ProfileService.java
index 7029ea7fe..41d009b9d 100644
--- a/base/ca/src/org/dogtagpki/server/ca/rest/ProfileService.java
+++ b/base/ca/src/org/dogtagpki/server/ca/rest/ProfileService.java
@@ -104,7 +104,6 @@ public class ProfileService extends PKIService implements ProfileResource {
private IProfileSubsystem ps = (IProfileSubsystem) CMS.getSubsystem(IProfileSubsystem.ID);
private IPluginRegistry registry = (IPluginRegistry) CMS.getSubsystem(CMS.SUBSYSTEM_REGISTRY);
- private IConfigStore cs = CMS.getConfigStore().getSubStore("profile");
private final static String LOGGING_SIGNED_AUDIT_CERT_PROFILE_APPROVAL =
"LOGGING_SIGNED_AUDIT_CERT_PROFILE_APPROVAL_4";
@@ -215,8 +214,6 @@ public class ProfileService extends PKIService implements ProfileResource {
@Override
public Response retrieveProfile(String profileId) throws ProfileNotFoundException {
- IProfile profile = getProfile(profileId);
-
ProfileData data = null;
try {
data = createProfileData(profileId);
@@ -247,15 +244,7 @@ public class ProfileService extends PKIService implements ProfileResource {
public ProfileData createProfileData(String profileId) throws EBaseException {
-
- IProfile profile;
-
- try {
- profile = ps.getProfile(profileId);
- } catch (EProfileException e) {
- e.printStackTrace();
- throw new ProfileNotFoundException(profileId);
- }
+ IProfile profile = getProfile(profileId);
ProfileData data = new ProfileData();
diff --git a/base/server/cmscore/src/com/netscape/cmscore/profile/ProfileSubsystem.java b/base/server/cmscore/src/com/netscape/cmscore/profile/ProfileSubsystem.java
index 90d7479e4..5ef3f2b81 100644
--- a/base/server/cmscore/src/com/netscape/cmscore/profile/ProfileSubsystem.java
+++ b/base/server/cmscore/src/com/netscape/cmscore/profile/ProfileSubsystem.java
@@ -80,7 +80,6 @@ public class ProfileSubsystem
if (info == null) {
throw new EBaseException("No plugins for type : profile, with id " + classid);
}
- String configPath = subStore.getString(PROP_CONFIG);
CMS.debug("Start Profile Creation - " + id + " " + classid + " " + info.getClassName());
createProfile(id, classid, info.getClassName(), false);