diff options
author | Endi Sukma Dewata <edewata@redhat.com> | 2012-02-13 15:11:56 -0600 |
---|---|---|
committer | Endi Sukma Dewata <edewata@redhat.com> | 2012-02-20 14:56:55 -0600 |
commit | 26f168f38aa13ed6f5d1be09ab8fbe828f631757 (patch) | |
tree | bb3ce31a7d65ac17d0132488f1c34714df8e2dda /pki/base/common/src/com/netscape/cmscore | |
parent | 046cd4e89b9a0deb3ce1bb26833bd86567fe0b4b (diff) | |
download | pki-26f168f38aa13ed6f5d1be09ab8fbe828f631757.tar.gz pki-26f168f38aa13ed6f5d1be09ab8fbe828f631757.tar.xz pki-26f168f38aa13ed6f5d1be09ab8fbe828f631757.zip |
Removed unused variables (part 1).
This patch brings down the warnings from 2917 to 2406.
Ticket #103
Diffstat (limited to 'pki/base/common/src/com/netscape/cmscore')
20 files changed, 50 insertions, 240 deletions
diff --git a/pki/base/common/src/com/netscape/cmscore/apps/CMSEngine.java b/pki/base/common/src/com/netscape/cmscore/apps/CMSEngine.java index 384b4cd67..5071a1c80 100644 --- a/pki/base/common/src/com/netscape/cmscore/apps/CMSEngine.java +++ b/pki/base/common/src/com/netscape/cmscore/apps/CMSEngine.java @@ -17,7 +17,6 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cmscore.apps; -import java.io.BufferedReader; import java.io.ByteArrayOutputStream; import java.io.File; import java.io.IOException; @@ -1563,8 +1562,6 @@ public class CMSEngine implements ICMSEngine { process.waitFor(); - BufferedReader pOut = null; - String l = null; } catch (Exception e) { } diff --git a/pki/base/common/src/com/netscape/cmscore/apps/Upgrade.java b/pki/base/common/src/com/netscape/cmscore/apps/Upgrade.java index b5307c448..326e9b5e6 100644 --- a/pki/base/common/src/com/netscape/cmscore/apps/Upgrade.java +++ b/pki/base/common/src/com/netscape/cmscore/apps/Upgrade.java @@ -162,7 +162,6 @@ public final class Upgrade { throws EBaseException { boolean isCA = false; boolean isRA = false; - boolean isKRA = false; // determine what subsystems do we have? IConfigStore cs = c.getSubStore("ca"); @@ -174,10 +173,6 @@ public final class Upgrade { if (cs != null && cs.size() > 0) { isRA = true; } - cs = c.getSubStore("kra"); - if (cs != null && cs.size() > 0) { - isKRA = true; - } Setup.installAuthImpls(c); Setup.installOIDMap(c); diff --git a/pki/base/common/src/com/netscape/cmscore/authentication/SSLClientCertAuthentication.java b/pki/base/common/src/com/netscape/cmscore/authentication/SSLClientCertAuthentication.java index 19438037b..3f0d7a87b 100644 --- a/pki/base/common/src/com/netscape/cmscore/authentication/SSLClientCertAuthentication.java +++ b/pki/base/common/src/com/netscape/cmscore/authentication/SSLClientCertAuthentication.java @@ -129,7 +129,6 @@ public class SSLClientCertAuthentication implements IAuthManager { } String clientCertIssuerDN = clientCert.getIssuerDN().toString(); - BigInteger[] bigIntArray = null; if (mCertDB != null) { /* is CA */ ICertRecord record = null; diff --git a/pki/base/common/src/com/netscape/cmscore/base/PropConfigStore.java b/pki/base/common/src/com/netscape/cmscore/base/PropConfigStore.java index 1cc0330c7..482bcc7b9 100644 --- a/pki/base/common/src/com/netscape/cmscore/base/PropConfigStore.java +++ b/pki/base/common/src/com/netscape/cmscore/base/PropConfigStore.java @@ -251,7 +251,7 @@ public class PropConfigStore implements IConfigStore, Cloneable { * @exception EBaseException failed to retrieve value */ public String getString(String name) throws EBaseException { - String str = (String) get(name); + String str = get(name); if (str == null) { CMS.traceHashKey(mDebugType, getFullName(name), "<notpresent>"); @@ -629,7 +629,7 @@ public class PropConfigStore implements IConfigStore, Cloneable { */ public IConfigStore getSubStore(String name) { String fullname = getFullName(name); - String reference = (String) mSource.get(fullname); + String reference = mSource.get(fullname); if (reference == null) { PropConfigStore ps = new PropConfigStore(fullname, mSource); diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/CertificateRepository.java b/pki/base/common/src/com/netscape/cmscore/dbs/CertificateRepository.java index 6ae379840..0d004d335 100644 --- a/pki/base/common/src/com/netscape/cmscore/dbs/CertificateRepository.java +++ b/pki/base/common/src/com/netscape/cmscore/dbs/CertificateRepository.java @@ -38,12 +38,10 @@ import netscape.security.x509.X509CertInfo; import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.base.EBaseException; -import com.netscape.certsrv.base.IConfigStore; import com.netscape.certsrv.base.MetaInfo; import com.netscape.certsrv.base.SessionContext; import com.netscape.certsrv.ca.ICRLIssuingPoint; import com.netscape.certsrv.dbs.EDBException; -import com.netscape.certsrv.dbs.IDBRegistry; import com.netscape.certsrv.dbs.IDBSSession; import com.netscape.certsrv.dbs.IDBSearchResults; import com.netscape.certsrv.dbs.IDBSubsystem; @@ -90,13 +88,7 @@ public class CertificateRepository extends Repository throws EDBException { super(dbService, increment, baseDN); mBaseDN = certRepoBaseDN; - mDBService = dbService; - - // registers CMS database attributes - IDBRegistry reg = dbService.getRegistry(); - - IConfigStore cfg = mDBService.getConfigStore(); } public ICertRecord createCertRecord(BigInteger id, Certificate cert, MetaInfo meta) { diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/DBVirtualList.java b/pki/base/common/src/com/netscape/cmscore/dbs/DBVirtualList.java index 934cf1ea0..574ab41c0 100644 --- a/pki/base/common/src/com/netscape/cmscore/dbs/DBVirtualList.java +++ b/pki/base/common/src/com/netscape/cmscore/dbs/DBVirtualList.java @@ -640,8 +640,6 @@ public class DBVirtualList<E> implements IDBVirtualList<E> { * the caller should really check the index is within bound before this * but I'll take care of this just in case they are too irresponsible */ - int baseJumpTo = 0; - if (!mInitialized) mSize = getSize(); diff --git a/pki/base/common/src/com/netscape/cmscore/extensions/KeyUsage.java b/pki/base/common/src/com/netscape/cmscore/extensions/KeyUsage.java index bba95949d..dc4423357 100644 --- a/pki/base/common/src/com/netscape/cmscore/extensions/KeyUsage.java +++ b/pki/base/common/src/com/netscape/cmscore/extensions/KeyUsage.java @@ -19,7 +19,6 @@ package com.netscape.cmscore.extensions; import java.io.IOException; -import netscape.security.util.DerOutputStream; import netscape.security.util.ObjectIdentifier; import netscape.security.x509.Extension; import netscape.security.x509.KeyUsageExtension; @@ -196,7 +195,6 @@ public class KeyUsage implements ICMSExtension { ext = (KeyUsageExtension) extension; } else { try { - DerOutputStream der = new DerOutputStream(); byte[] value = extension.getExtensionValue(); ext = new KeyUsageExtension(new Boolean(true), value); diff --git a/pki/base/common/src/com/netscape/cmscore/jobs/JobsScheduler.java b/pki/base/common/src/com/netscape/cmscore/jobs/JobsScheduler.java index 654f3e494..79225a13f 100644 --- a/pki/base/common/src/com/netscape/cmscore/jobs/JobsScheduler.java +++ b/pki/base/common/src/com/netscape/cmscore/jobs/JobsScheduler.java @@ -156,21 +156,19 @@ public class JobsScheduler implements Runnable, IJobsScheduler { // register the job mJobs.put(jobName, job); - } catch (ClassNotFoundException e) { - String errMsg = "JobsScheduler:: init()-" + e.toString(); + } catch (ClassNotFoundException e) { log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_JOBS_INIT_ERROR", e.toString())); throw new EJobsException(CMS.getUserMessage("CMS_JOB_LOAD_CLASS_FAILED", classPath)); - } catch (IllegalAccessException e) { - String errMsg = "JobsScheduler:: init()-" + e.toString(); + } catch (IllegalAccessException e) { log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_JOBS_INIT_ERROR", e.toString())); throw new EJobsException(CMS.getUserMessage("CMS_JOB_LOAD_CLASS_FAILED", classPath)); - } catch (InstantiationException e) { - String errMsg = "JobsScheduler: init()-" + e.toString(); + } catch (InstantiationException e) { log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_JOBS_INIT_ERROR", e.toString())); throw new EJobsException(CMS.getUserMessage("CMS_JOB_LOAD_CLASS_FAILED", classPath)); + } catch (EBaseException e) { log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_JOBS_INIT_ERROR", e.toString())); throw e; @@ -237,7 +235,7 @@ public class JobsScheduler implements Runnable, IJobsScheduler { try { Thread.sleep(duration); } catch (InterruptedException e) { - System.out.println(e.toString()); + System.out.println(e); } } // if (duration == 0), it's time @@ -494,19 +492,19 @@ public class JobsScheduler implements Runnable, IJobsScheduler { log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_JOBS_CREATE_NEW", e.toString())); if (Debug.ON) - Debug.trace("class NOT instantiated: " + e.toString()); + Debug.trace("class NOT instantiated: " + e); throw new EJobsException(CMS.getUserMessage("CMS_JOB_LOAD_CLASS_FAILED", className)); } catch (ClassNotFoundException e) { log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_JOBS_CREATE_NEW", e.toString())); if (Debug.ON) - Debug.trace("class NOT instantiated: " + e.toString()); + Debug.trace("class NOT instantiated: " + e); throw new EJobsException(CMS.getUserMessage("CMS_JOB_LOAD_CLASS_FAILED", className)); } catch (IllegalAccessException e) { log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_JOBS_CREATE_NEW", e.toString())); if (Debug.ON) - Debug.trace("class NOT instantiated: " + e.toString()); + Debug.trace("class NOT instantiated: " + e); throw new EJobsException(CMS.getUserMessage("CMS_JOB_LOAD_CLASS_FAILED", className)); } } diff --git a/pki/base/common/src/com/netscape/cmscore/ldap/PublisherProcessor.java b/pki/base/common/src/com/netscape/cmscore/ldap/PublisherProcessor.java index a0bc2d145..147eee07e 100644 --- a/pki/base/common/src/com/netscape/cmscore/ldap/PublisherProcessor.java +++ b/pki/base/common/src/com/netscape/cmscore/ldap/PublisherProcessor.java @@ -154,20 +154,17 @@ public class PublisherProcessor implements isEnable = true; } catch (ClassNotFoundException e) { - String errMsg = "PublisherProcessor:: init()-" + e.toString(); - log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_LDAP_PUBLISHER_INIT_FAILED", e.toString())); throw new ELdapException(CMS.getUserMessage("CMS_LDAP_FAIL_LOAD_CLASS", className)); - } catch (IllegalAccessException e) { - String errMsg = "PublisherProcessor:: init()-" + e.toString(); + } catch (IllegalAccessException e) { log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_LDAP_PUBLISHER_INIT_FAILED", e.toString())); throw new ELdapException(CMS.getUserMessage("CMS_LDAP_FAIL_LOAD_CLASS", className)); - } catch (InstantiationException e) { - String errMsg = "PublisherProcessor: init()-" + e.toString(); + } catch (InstantiationException e) { log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_LDAP_PUBLISHER_INIT_FAILED", e.toString())); throw new ELdapException(CMS.getUserMessage("CMS_LDAP_FAIL_LOAD_CLASS", className)); + } catch (Throwable e) { log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_LDAP_SKIP_PUBLISHER", insName, e.toString())); // Let the server continue if it is a @@ -241,20 +238,17 @@ public class PublisherProcessor implements mapperInst.init(mConfig); isEnable = true; } catch (ClassNotFoundException e) { - String errMsg = "PublisherProcessor:: init()-" + e.toString(); - log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_LDAP_PUBLISHER_INIT_FAILED", e.toString())); throw new ELdapException(CMS.getUserMessage("CMS_LDAP_FAIL_LOAD_CLASS", className)); - } catch (IllegalAccessException e) { - String errMsg = "PublisherProcessor:: init()-" + e.toString(); + } catch (IllegalAccessException e) { log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_LDAP_PUBLISHER_INIT_FAILED", e.toString())); throw new ELdapException(CMS.getUserMessage("CMS_LDAP_FAIL_LOAD_CLASS", className)); - } catch (InstantiationException e) { - String errMsg = "PublisherProcessor: init()-" + e.toString(); + } catch (InstantiationException e) { log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_LDAP_PUBLISHER_INIT_FAILED", e.toString())); throw new ELdapException(CMS.getUserMessage("CMS_LDAP_FAIL_LOAD_CLASS", className)); + } catch (Throwable e) { log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_LDAP_SKIP_MAPPER", insName, e.toString())); // Let the server continue if it is a @@ -331,20 +325,17 @@ public class PublisherProcessor implements log(ILogger.LL_INFO, "rule instance " + insName + " added"); } catch (ClassNotFoundException e) { - String errMsg = "PublisherProcessor:: init()-" + e.toString(); - log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_LDAP_PUBLISHER_INIT_FAILED", e.toString())); throw new ELdapException(CMS.getUserMessage("CMS_LDAP_FAIL_LOAD_CLASS", className)); - } catch (IllegalAccessException e) { - String errMsg = "PublisherProcessor:: init()-" + e.toString(); + } catch (IllegalAccessException e) { log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_LDAP_PUBLISHER_INIT_FAILED", e.toString())); throw new ELdapException(CMS.getUserMessage("CMS_LDAP_FAIL_LOAD_CLASS", className)); - } catch (InstantiationException e) { - String errMsg = "PublisherProcessor: init()-" + e.toString(); + } catch (InstantiationException e) { log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_LDAP_PUBLISHER_INIT_FAILED", e.toString())); throw new ELdapException(CMS.getUserMessage("CMS_LDAP_FAIL_LOAD_CLASS", className)); + } catch (Throwable e) { if (mConfig == null) { throw new ELdapException(CMS.getUserMessage("CMS_LDAP_FAIL_LOAD_CLASS", className)); @@ -612,7 +603,7 @@ public class PublisherProcessor implements public Vector<String> getMapperInstanceParams(String insName) throws ELdapException { ILdapMapper mapperInst = null; - MapperProxy proxy = (MapperProxy) mMapperInsts.get(insName); + MapperProxy proxy = mMapperInsts.get(insName); if (proxy == null) { return null; @@ -629,8 +620,7 @@ public class PublisherProcessor implements public Vector<String> getPublisherDefaultParams(String implName) throws ELdapException { // is this a registered implname? - PublisherPlugin plugin = (PublisherPlugin) - mPublisherPlugins.get(implName); + PublisherPlugin plugin = mPublisherPlugins.get(implName); if (plugin == null) { log(ILogger.LL_FAILURE, @@ -841,7 +831,7 @@ public class PublisherProcessor implements "Cannot mark cert 0x" + serialNo.toString(16) + " published as " + published + " in the ldap directory. Cert Record not found. Error: " - + e.toString() + + e + " Don't be alarmed if it's a subordinate ca or clone's ca siging cert. " + "Otherwise your internal db may be corrupted."); } @@ -903,10 +893,10 @@ public class PublisherProcessor implements } catch (Exception e) { // continue publishing even publisher has errors //log(ILogger.LL_WARN, e.toString()); - CMS.debug("PublisherProcessor::publishCACert returned error: " + e.toString()); + CMS.debug("PublisherProcessor::publishCACert returned error: " + e); error = true; errorRule = errorRule + " " + rule.getInstanceName() + - " error:" + e.toString(); + " error:" + e; } } // set the ldap published flag. @@ -989,7 +979,6 @@ public class PublisherProcessor implements */ public void publishXCertPair(byte[] pair) throws ELdapException { - boolean error = false; String errorRule = ""; if (!enabled()) @@ -1036,11 +1025,10 @@ public class PublisherProcessor implements } catch (Exception e) { // continue publishing even publisher has errors //log(ILogger.LL_WARN, e.toString()); - error = true; errorRule = errorRule + " " + rule.getInstanceName() + - " error:" + e.toString(); + " error:" + e; - CMS.debug("PublisherProcessor::publishXCertPair: error: " + e.toString()); + CMS.debug("PublisherProcessor::publishXCertPair: error: " + e); } } } @@ -1248,7 +1236,7 @@ public class PublisherProcessor implements error = true; errorRule = errorRule + " " + rule.getInstanceName(); - CMS.debug("PublisherProcessor::publishCRL: error: " + e.toString()); + CMS.debug("PublisherProcessor::publishCRL: error: " + e); } } } catch (ELdapException e) { @@ -1306,15 +1294,15 @@ public class PublisherProcessor implements } } catch (Exception e) { CMS.debug( - "Error publishing CRL to " + dn + ": " + e.toString()); + "Error publishing CRL to " + dn + ": " + e); error = true; errorRule = errorRule + " " + rule.getInstanceName(); - CMS.debug("PublisherProcessor::publishCRL: error: " + e.toString()); + CMS.debug("PublisherProcessor::publishCRL: error: " + e); } } } catch (ELdapException e) { CMS.debug( - "Error publishing CRL to " + dn + ": " + e.toString()); + "Error publishing CRL to " + dn + ": " + e); throw e; } finally { if (conn != null) { diff --git a/pki/base/common/src/com/netscape/cmscore/ldapconn/LdapAnonConnFactory.java b/pki/base/common/src/com/netscape/cmscore/ldapconn/LdapAnonConnFactory.java index f7a772232..dc4c86547 100644 --- a/pki/base/common/src/com/netscape/cmscore/ldapconn/LdapAnonConnFactory.java +++ b/pki/base/common/src/com/netscape/cmscore/ldapconn/LdapAnonConnFactory.java @@ -344,10 +344,6 @@ public class LdapAnonConnFactory implements ILdapConnFactory { if (anon.getFacId() != mConns) { // returning a connection not from this factory. log(ILogger.LL_WARN, "returnConn: unknown connection."); - - /* swallow this error but see who's doing it. */ - ELdapException e = - new ELdapException(CMS.getUserMessage("CMS_LDAP_UNKNOWN_RETURNED_CONN")); } // check if conn has already been returned. for (int i = 0; i < mNumConns; i++) { @@ -357,8 +353,6 @@ public class LdapAnonConnFactory implements ILdapConnFactory { /* swallow this error but see who's doing it. */ log(ILogger.LL_WARN, "returnConn: previously returned connection."); - ELdapException e = - new ELdapException(CMS.getUserMessage("CMS_LDAP_BAD_RETURNED_CONN")); } } diff --git a/pki/base/common/src/com/netscape/cmscore/ldapconn/LdapBoundConnFactory.java b/pki/base/common/src/com/netscape/cmscore/ldapconn/LdapBoundConnFactory.java index 64f22d302..b4839f7d5 100644 --- a/pki/base/common/src/com/netscape/cmscore/ldapconn/LdapBoundConnFactory.java +++ b/pki/base/common/src/com/netscape/cmscore/ldapconn/LdapBoundConnFactory.java @@ -417,19 +417,11 @@ public class LdapBoundConnFactory implements ILdapBoundConnFactory { if (boundconn.getFacId() != mConns) { log(ILogger.LL_WARN, "returnConn: unknown connection."); - - /* swallow this exception but see who's doing it. */ - ELdapException e = - new ELdapException(CMS.getUserMessage("CMS_LDAP_UNKNOWN_RETURNED_CONN")); } for (int i = 0; i < mNumConns; i++) { if (mConns[i] == conn) { CMS.debug( "returnConn: previously returned connection."); - - /* swallow this exception but see who's doing it */ - ELdapException e = - new ELdapException(CMS.getUserMessage("CMS_LDAP_BAD_RETURNED_CONN")); } } mConns[mNumConns++] = boundconn; diff --git a/pki/base/common/src/com/netscape/cmscore/logging/LogSubsystem.java b/pki/base/common/src/com/netscape/cmscore/logging/LogSubsystem.java index 8ac304f8c..1cfce4e65 100644 --- a/pki/base/common/src/com/netscape/cmscore/logging/LogSubsystem.java +++ b/pki/base/common/src/com/netscape/cmscore/logging/LogSubsystem.java @@ -126,17 +126,14 @@ public class LogSubsystem implements ILogSubsystem { // for view from console } catch (ClassNotFoundException e) { - String errMsg = "LogSubsystem:: init()-" + e.toString(); - throw new EBaseException(insName + ":Failed to instantiate class " + className); - } catch (IllegalAccessException e) { - String errMsg = "LogSubsystem:: init()-" + e.toString(); + } catch (IllegalAccessException e) { throw new EBaseException(insName + ":Failed to instantiate class " + className); - } catch (InstantiationException e) { - String errMsg = "LogSubsystem:: init()-" + e.toString(); + } catch (InstantiationException e) { throw new EBaseException(insName + ":Failed to instantiate class " + className); + } catch (Throwable e) { e.printStackTrace(); throw new EBaseException(insName diff --git a/pki/base/common/src/com/netscape/cmscore/notification/EmailTemplate.java b/pki/base/common/src/com/netscape/cmscore/notification/EmailTemplate.java index 0a1a05f6e..bdc16a24e 100644 --- a/pki/base/common/src/com/netscape/cmscore/notification/EmailTemplate.java +++ b/pki/base/common/src/com/netscape/cmscore/notification/EmailTemplate.java @@ -78,9 +78,7 @@ public class EmailTemplate implements IEmailTemplate { /* check if file exists and is accessible */ if ((!template.exists()) || (!template.canRead()) || (template.isDirectory())) { - String error = "Template: " + mTemplateFile + " does not exist or invalid"; - - log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_NOTIFY_TEMPLATE_NOT_EXIST")); + log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_NOTIFY_TEMPLATE_NOT_EXIST", mTemplateFile)); return false; } @@ -90,9 +88,7 @@ public class EmailTemplate implements IEmailTemplate { try { input = new FileReader(template); } catch (FileNotFoundException e) { - String error = "Template: " + mTemplateFile + " not found"; - - log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_NOTIFY_TEMPLATE_NOT_FOUND")); + log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_NOTIFY_TEMPLATE_NOT_FOUND", mTemplateFile)); return false; } @@ -100,8 +96,6 @@ public class EmailTemplate implements IEmailTemplate { /* load template */ mFileContents = loadFile(input); if (mFileContents == null) { - String error = "Template: Error loading file into string"; - log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_NOTIFY_TEMPLATE_LOAD_ERROR")); return false; } @@ -159,8 +153,6 @@ public class EmailTemplate implements IEmailTemplate { buf.append("\n"); } } catch (IOException e) { - String error = "Template: Error loading file"; - log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_NOTIFY_TEMPLATE_LOADING")); return null; } diff --git a/pki/base/common/src/com/netscape/cmscore/policy/PolicySet.java b/pki/base/common/src/com/netscape/cmscore/policy/PolicySet.java index 37780cfc2..bd38138ff 100644 --- a/pki/base/common/src/com/netscape/cmscore/policy/PolicySet.java +++ b/pki/base/common/src/com/netscape/cmscore/policy/PolicySet.java @@ -152,9 +152,8 @@ public class PolicySet implements IPolicySet { */ public PolicyResult apply(IRequest req) { // If there are no rules, we are done. - int cnt; - if ((cnt = mRules.size()) == 0) + if (mRules.size() == 0) return PolicyResult.ACCEPTED; // All policies are applied before returning the result. Hence diff --git a/pki/base/common/src/com/netscape/cmscore/profile/ProfileSubsystem.java b/pki/base/common/src/com/netscape/cmscore/profile/ProfileSubsystem.java index b5f829f77..2435fa462 100644 --- a/pki/base/common/src/com/netscape/cmscore/profile/ProfileSubsystem.java +++ b/pki/base/common/src/com/netscape/cmscore/profile/ProfileSubsystem.java @@ -251,7 +251,7 @@ public class ProfileSubsystem implements IProfileSubsystem { public String getProfileEnableBy(String id) { if (!isProfileEnable(id)) return null; - IProfile profile = (IProfile) mProfiles.get(id); + IProfile profile = mProfiles.get(id); String enableBy = null; try { @@ -295,11 +295,11 @@ public class ProfileSubsystem implements IProfileSubsystem { */ public IProfile getProfile(String id) throws EProfileException { - return (IProfile) mProfiles.get(id); + return mProfiles.get(id); } public String getProfileClassId(String id) { - return (String) mProfileClassIds.get(id); + return mProfileClassIds.get(id); } /** diff --git a/pki/base/common/src/com/netscape/cmscore/security/CertificateInfo.java b/pki/base/common/src/com/netscape/cmscore/security/CertificateInfo.java index 3eeb39e0c..fc7fb9087 100644 --- a/pki/base/common/src/com/netscape/cmscore/security/CertificateInfo.java +++ b/pki/base/common/src/com/netscape/cmscore/security/CertificateInfo.java @@ -226,7 +226,6 @@ public abstract class CertificateInfo { //KeyCertUtil.setOCSPSigning(mKeyPair, exts, mProperties); KeyCertUtil.setAuthInfoAccess(mKeyPair, exts, mProperties); KeyCertUtil.setOCSPNoCheck(mKeyPair, exts, mProperties); - KeyPair caKeyPair = (KeyPair) mProperties.get(Constants.PR_CA_KEYPAIR); String aki = mProperties.getAKI(); if ((aki != null) && (aki.equals(Constants.TRUE))) { diff --git a/pki/base/common/src/com/netscape/cmscore/security/JssSubsystem.java b/pki/base/common/src/com/netscape/cmscore/security/JssSubsystem.java index b6aaa02cc..8bcc74de5 100644 --- a/pki/base/common/src/com/netscape/cmscore/security/JssSubsystem.java +++ b/pki/base/common/src/com/netscape/cmscore/security/JssSubsystem.java @@ -852,7 +852,7 @@ public final class JssSubsystem implements ICryptoSubsystem { public void isX500DN(String dn) throws EBaseException { try { - X500Name name = new X500Name(dn); + new X500Name(dn); // check for errors } catch (IOException e) { log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_SECURITY_X500_NAME", e.toString())); throw new EBaseException(CMS.getUserMessage("CMS_BASE_INVALID_X500_NAME", dn)); @@ -944,7 +944,6 @@ public final class JssSubsystem implements ICryptoSubsystem { public KeyPair getECCKeyPair(KeyCertData properties) throws EBaseException { String token = Constants.PR_INTERNAL_TOKEN_NAME; - String keyType = "ECC"; String keyCurve = "nistp512"; String certType = null; KeyPair pair = null; @@ -1067,7 +1066,6 @@ public final class JssSubsystem implements ICryptoSubsystem { X509Certificate cert = getCertificate(nickname, serialno, issuername); if (cert instanceof TokenCertificate) { TokenCertificate tcert = (TokenCertificate) cert; - CryptoStore store = tcert.getOwningToken().getCryptoStore(); CMS.debug("*** deleting this token cert"); tcert.getOwningToken().getCryptoStore().deleteCert(tcert); @@ -1120,7 +1118,6 @@ public final class JssSubsystem implements ICryptoSubsystem { CMS.debug("*** removing root cert"); if (cert instanceof TokenCertificate) { TokenCertificate tcert = (TokenCertificate) cert; - CryptoStore store = tcert.getOwningToken().getCryptoStore(); CMS.debug("*** deleting this token cert"); tcert.getOwningToken().getCryptoStore().deleteCert(tcert); @@ -1175,8 +1172,9 @@ public final class JssSubsystem implements ICryptoSubsystem { for (int i = 0; i < list.length; i++) { try { + @SuppressWarnings("unused") PrivateKey key = - CryptoManager.getInstance().findPrivKeyByCert(list[i]); + CryptoManager.getInstance().findPrivKeyByCert(list[i]); // check for errors Debug.trace("JssSubsystem getRootCerts: find private key " + list[i].getNickname()); } catch (ObjectNotFoundException e) { @@ -1247,8 +1245,9 @@ public final class JssSubsystem implements ICryptoSubsystem { for (int i = 0; i < list.length; i++) { try { + @SuppressWarnings("unused") PrivateKey key = - CryptoManager.getInstance().findPrivKeyByCert(list[i]); + CryptoManager.getInstance().findPrivKeyByCert(list[i]); // check for errors String nickname = list[i].getNickname(); if (tokenName.equals(Constants.PR_INTERNAL_TOKEN_NAME) || tokenName.equals(Constants.PR_FULL_INTERNAL_TOKEN_NAME)) { @@ -1307,7 +1306,6 @@ public final class JssSubsystem implements ICryptoSubsystem { while (enums.hasMoreElements()) { CryptoToken token = (CryptoToken) enums.nextElement(); - String tokenName = token.getName(); CryptoStore store = token.getCryptoStore(); X509Certificate[] list = store.getCertificates(); @@ -1538,7 +1536,6 @@ public final class JssSubsystem implements ICryptoSubsystem { if (notAfter.equals(qualifier)) { if (cert instanceof TokenCertificate) { TokenCertificate tcert = (TokenCertificate) cert; - CryptoStore store = tcert.getOwningToken().getCryptoStore(); tcert.getOwningToken().getCryptoStore().deleteCert(tcert); } else { @@ -1620,7 +1617,6 @@ public final class JssSubsystem implements ICryptoSubsystem { if (notAfter.equals(qualifier)) { if (cert instanceof TokenCertificate) { TokenCertificate tcert = (TokenCertificate) cert; - CryptoStore store = tcert.getOwningToken().getCryptoStore(); tcert.getOwningToken().getCryptoStore().deleteCert(tcert); } else { @@ -1660,7 +1656,6 @@ public final class JssSubsystem implements ICryptoSubsystem { public void deleteTokenCertificate(String nickname, String pathname) throws EBaseException { try { X509Certificate cert = CryptoManager.getInstance().findCertByNickname(nickname); - String issuerName = cert.getSubjectDN().getName(); Principal principal = cert.getSubjectDN(); DN dn = new DN(principal.getName()); BigInteger serialno = cert.getSerialNumber(); @@ -1674,7 +1669,6 @@ public final class JssSubsystem implements ICryptoSubsystem { stream.close(); if (cert instanceof TokenCertificate) { TokenCertificate tcert = (TokenCertificate) cert; - CryptoStore store = tcert.getOwningToken().getCryptoStore(); tcert.getOwningToken().getCryptoStore().deleteCert(tcert); } else diff --git a/pki/base/common/src/com/netscape/cmscore/security/KeyCertUtil.java b/pki/base/common/src/com/netscape/cmscore/security/KeyCertUtil.java index 1d03911b4..3eef57718 100644 --- a/pki/base/common/src/com/netscape/cmscore/security/KeyCertUtil.java +++ b/pki/base/common/src/com/netscape/cmscore/security/KeyCertUtil.java @@ -141,11 +141,11 @@ public class KeyCertUtil { DerValue b_der = new DerValue(b); while (b_der.data.available() != 0) { - Extension de = new Extension(b_der.data.getDerValue()); + new Extension(b_der.data.getDerValue()); // check for errors } } catch (IOException e) { try { - Extension de = new Extension(new DerValue(b)); + new Extension(new DerValue(b)); // check for errors } catch (IOException ex) { throw new EBaseException(CMS.getUserMessage("CMS_BASE_INVALID_CERT_EXTENSION")); } diff --git a/pki/base/common/src/com/netscape/cmscore/security/PWUtil.java b/pki/base/common/src/com/netscape/cmscore/security/PWUtil.java index 524e7a504..3938bf5d2 100644 --- a/pki/base/common/src/com/netscape/cmscore/security/PWUtil.java +++ b/pki/base/common/src/com/netscape/cmscore/security/PWUtil.java @@ -17,9 +17,6 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cmscore.security; -import java.io.BufferedReader; -import java.io.InputStreamReader; - import org.mozilla.jss.util.Password; import org.mozilla.jss.util.PasswordCallback; @@ -27,9 +24,6 @@ public class PWUtil { public static Password readPasswordFromStream() throws PasswordCallback.GiveUpException { - BufferedReader in; - - in = new BufferedReader(new InputStreamReader(System.in)); StringBuffer buf = new StringBuffer(); String passwordString = new String(); diff --git a/pki/base/common/src/com/netscape/cmscore/usrgrp/UGSubsystem.java b/pki/base/common/src/com/netscape/cmscore/usrgrp/UGSubsystem.java index bf5606196..1bf251865 100644 --- a/pki/base/common/src/com/netscape/cmscore/usrgrp/UGSubsystem.java +++ b/pki/base/common/src/com/netscape/cmscore/usrgrp/UGSubsystem.java @@ -133,7 +133,6 @@ public final class UGSubsystem implements IUGSubsystem { mLdapConnFactory = new LdapBoundConnFactory(); mLdapConnFactory.init(ldapConfig); - IConfigStore c = config.getSubStore(PROP_IMPL); } catch (EBaseException e) { if (CMS.isPreOpMode()) return; @@ -250,16 +249,8 @@ public final class UGSubsystem implements IUGSubsystem { return (User) e.nextElement(); } catch (LDAPException e) { - String errMsg = "findUser()" + e.toString(); - - if (e.getLDAPResultCode() == LDAPException.UNAVAILABLE) { - errMsg = "findUser: " + "Internal DB is unavailable"; - } log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_USRGRP_FIND_USER", e.toString())); } catch (ELdapException e) { - String errMsg = - "find User: Could not get connection to internaldb. Error " + e; - log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_USRGRP_INTERNAL_DB", e.toString())); } finally { if (ldapconn != null) @@ -307,19 +298,10 @@ public final class UGSubsystem implements IUGSubsystem { Enumeration<IUser> e = buildUsers(res); - return (User) e.nextElement(); + return e.nextElement(); } catch (LDAPException e) { - String errMsg = "findUsersByCert()" + e.toString(); - - if (e.getLDAPResultCode() == LDAPException.UNAVAILABLE) { - errMsg = "findUsersByCert: " + "Internal DB is unavailable"; - } log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_USRGRP_FIND_USER_BY_CERT", e.toString())); } catch (ELdapException e) { - String errMsg = - "find Users By Cert: " + - "Could not get connection to internaldb. Error " + e; - log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_USRGRP_FIND_USER_BY_CERT", e.toString())); } finally { if (ldapconn != null) @@ -349,16 +331,8 @@ public final class UGSubsystem implements IUGSubsystem { return e; } catch (LDAPException e) { - String errMsg = "findUsers()" + e.toString(); - - if (e.getLDAPResultCode() == LDAPException.UNAVAILABLE) { - errMsg = "findUsersByCert: " + "Internal DB is unavailable"; - } log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_USRGRP_FIND_USERS", e.toString())); } catch (ELdapException e) { - String errMsg = - "find Users: Could not get connection to internaldb. Error " + e; - log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_USRGRP_FIND_USERS", e.toString())); } finally { if (ldapconn != null) @@ -395,11 +369,6 @@ public final class UGSubsystem implements IUGSubsystem { return e; } catch (LDAPException e) { - String errMsg = "listUsers()" + e.toString(); - - if (e.getLDAPResultCode() == LDAPException.UNAVAILABLE) { - errMsg = "findUsersByCert: " + "Internal DB is unavailable"; - } log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_USRGRP_LIST_USERS", e.toString())); } catch (Exception e) { throw new EUsrGrpException(CMS.getUserMessage("CMS_INTERNAL_ERROR")); @@ -526,10 +495,7 @@ public final class UGSubsystem implements IUGSubsystem { if (userdn != null) { id.setUserDN(userdn); } else { // the impossible - String errMsg = "buildUser(): user DN not found: " + - userdn; - - log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_USRGRP_BUILD_USER")); + log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_USRGRP_BUILD_USER", userdn)); throw new EUsrGrpException(CMS.getUserMessage("CMS_INTERNAL_ERROR")); } @@ -738,9 +704,6 @@ public final class UGSubsystem implements IUGSubsystem { ldapconn = getConn(); ldapconn.add(entry); } catch (ELdapException e) { - String errMsg = - "add User: Could not get connection to internaldb. Error " + e; - log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_USRGRP_ADD_USER", e.toString())); } finally { if (ldapconn != null) @@ -807,18 +770,9 @@ public final class UGSubsystem implements IUGSubsystem { if (Debug.ON) { e.printStackTrace(); } - String errMsg = "addUserCert():" + e.toString(); - - if (e.getLDAPResultCode() == LDAPException.UNAVAILABLE) { - errMsg = "findUsersByCert: " + "Internal DB is unavailable"; - } log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_USRGRP_ADD_USER", e.toString())); throw e; } catch (ELdapException e) { - String errMsg = - "add User Cert: " + - "Could not get connection to internaldb. Error " + e; - log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_USRGRP_ADD_USER", e.toString())); } finally { if (ldapconn != null) @@ -915,19 +869,9 @@ public final class UGSubsystem implements IUGSubsystem { ); } catch (LDAPException e) { - String errMsg = "removeUserCert():" + e; - - if (e.getLDAPResultCode() == LDAPException.UNAVAILABLE) { - errMsg = - "removeUserCert: " + "Internal DB is unavailable"; - } log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_USRGRP_REMOVE_USER", e.toString())); throw new EUsrGrpException(CMS.getUserMessage("CMS_USRGRP_MOD_USER_FAIL")); } catch (ELdapException e) { - String errMsg = - "remove User Cert: " + - "Could not get connection to internaldb. Error " + e; - log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_USRGRP_REMOVE_USER", e.toString())); } finally { if (ldapconn != null) @@ -959,18 +903,10 @@ public final class UGSubsystem implements IUGSubsystem { ldapconn.modify(groupDN, singleChange); } catch (LDAPException e) { - String errMsg = "removeUserFromGroup()" + e.toString(); - - if (e.getLDAPResultCode() == LDAPException.UNAVAILABLE) { - errMsg = "removeUser: " + "Internal DB is unavailable"; - } log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_USRGRP_REMOVE_USER_FROM_GROUP", e.toString())); throw new EUsrGrpException(CMS.getUserMessage("CMS_USRGRP_REMOVE_USER_FAIL")); } catch (ELdapException e) { - String errMsg = - "removeUserFromGroup: Could not get connection to internaldb. Error " + e; - log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_USRGRP_REMOVE_USER_FROM_GROUP", e.toString())); } finally { if (ldapconn != null) @@ -1001,18 +937,10 @@ public final class UGSubsystem implements IUGSubsystem { ); } catch (LDAPException e) { - String errMsg = "removeUser()" + e.toString(); - - if (e.getLDAPResultCode() == LDAPException.UNAVAILABLE) { - errMsg = "removeUser: " + "Internal DB is unavailable"; - } log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_USRGRP_REMOVE_USER", e.toString())); throw new EUsrGrpException(CMS.getUserMessage("CMS_USRGRP_REMOVE_USER_FAIL")); } catch (ELdapException e) { - String errMsg = - "remove User: Could not get connection to internaldb. Error " + e; - log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_USRGRP_REMOVE_USER", e.toString())); } finally { if (ldapconn != null) @@ -1164,18 +1092,9 @@ public final class UGSubsystem implements IUGSubsystem { return buildGroups(res); } catch (LDAPException e) { - String errMsg = - "findGroups: could not find group " + filter + ". Error " + e; - - if (e.getLDAPResultCode() == LDAPException.UNAVAILABLE) { - errMsg = "findGroups: " + "Internal DB is unavailable"; - } log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_USRGRP_FIND_GROUPS", e.toString())); return null; } catch (ELdapException e) { - String errMsg = - "find Groups: Could not get connection to internaldb. Error " + e; - log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_USRGRP_FIND_GROUPS", e.toString())); return null; } finally { @@ -1189,7 +1108,7 @@ public final class UGSubsystem implements IUGSubsystem { if (groups == null || !groups.hasMoreElements()) return null; - return (Group) groups.nextElement(); + return groups.nextElement(); } /** @@ -1217,16 +1136,8 @@ public final class UGSubsystem implements IUGSubsystem { return buildGroups(res); } catch (LDAPException e) { - String errMsg = "listGroups()" + e.toString(); - - if (e.getLDAPResultCode() == LDAPException.UNAVAILABLE) { - errMsg = "listGroups: " + "Internal DB is unavailable"; - } log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_USRGRP_LIST_GROUPS", e.toString())); } catch (ELdapException e) { - String errMsg = - "list Groups: Could not get connection to internaldb. Error " + e; - log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_USRGRP_LIST_GROUPS", e.toString())); } finally { if (ldapconn != null) @@ -1445,8 +1356,7 @@ public final class UGSubsystem implements IUGSubsystem { // that the filter matched, and so the user correctly // authenticated. if (res.hasMoreElements()) { - // actually read the entry - LDAPEntry entry = (LDAPEntry) res.nextElement(); + res.nextElement(); // consume the entry founduser = true; } Debug.trace("authorization result: " + founduser); @@ -1510,18 +1420,10 @@ public final class UGSubsystem implements IUGSubsystem { ldapconn = getConn(); ldapconn.add(entry); } catch (LDAPException e) { - String errMsg = "addGroup()" + e.toString(); - - if (e.getLDAPResultCode() == LDAPException.UNAVAILABLE) { - errMsg = "addGroup: " + "Internal DB is unavailable"; - } log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_USRGRP_ADD_GROUP", e.toString())); throw new EUsrGrpException(CMS.getUserMessage("CMS_USRGRP_ADD_GROUP_FAIL")); } catch (ELdapException e) { - String errMsg = - "add Group: Could not get connection to internaldb. Error " + e; - log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_USRGRP_ADD_GROUP", e.toString())); throw new EUsrGrpException(CMS.getUserMessage("CMS_USRGRP_ADD_GROUP_FAIL")); } finally { @@ -1547,19 +1449,10 @@ public final class UGSubsystem implements IUGSubsystem { ldapconn = getConn(); ldapconn.delete("cn=" + name + "," + getGroupBaseDN()); } catch (LDAPException e) { - String errMsg = "removeGroup()" + e.toString(); - - if (e.getLDAPResultCode() == LDAPException.UNAVAILABLE) { - errMsg = "removeGroup: " + "Internal DB is unavailable"; - } log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_USRGRP_REMOVE_GROUP", e.toString())); throw new EUsrGrpException(CMS.getUserMessage("CMS_USRGRP_REMOVE_GROUP_FAIL")); } catch (ELdapException e) { - String errMsg = - "remove Group: Could not get connection to internaldb. " + - "Error " + e; - log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_USRGRP_REMOVE_GROUP", e.toString())); } finally { if (ldapconn != null) @@ -1612,11 +1505,6 @@ public final class UGSubsystem implements IUGSubsystem { ldapconn.modify("cn=" + grp.getGroupID() + "," + getGroupBaseDN(), mod); } catch (LDAPException e) { - String errMsg = " modifyGroup()" + e.toString(); - - if (e.getLDAPResultCode() == LDAPException.UNAVAILABLE) { - errMsg = "modifyGroup: " + "Internal DB is unavailable"; - } log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_USRGRP_MODIFY_GROUP", e.toString())); throw new EUsrGrpException(CMS.getUserMessage("CMS_USRGRP_MOD_GROUP_FAIL")); @@ -1671,10 +1559,6 @@ public final class UGSubsystem implements IUGSubsystem { return entry.getDN(); } } catch (ELdapException e) { - String errMsg = - "convertUIDtoDN: Could not get connection to internaldb. " + - "Error " + e; - log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_USRGRP_CONVERT_UID", e.toString())); } finally { if (ldapconn != null) |