diff options
author | Adam Young <ayoung@redhat.com> | 2011-11-10 22:12:52 -0500 |
---|---|---|
committer | Adam Young <ayoung@redhat.com> | 2011-12-06 11:20:03 -0500 |
commit | 6119a0222dee4953d51311489d8863daa62d9b14 (patch) | |
tree | dc30408d3be499e1f84c1c49d41bbc109731fb7a /pki/base/ca | |
parent | 3c1a4af339dc1761b3a68abe9b0f26bd3cb389cf (diff) | |
download | pki-6119a0222dee4953d51311489d8863daa62d9b14.tar.gz pki-6119a0222dee4953d51311489d8863daa62d9b14.tar.xz pki-6119a0222dee4953d51311489d8863daa62d9b14.zip |
call statics statically
https://bugzilla.redhat.com/show_bug.cgi?id=728303
Updated with changes from code review
Leaving in the warning in GenericASN1Extension, ans that is an indication of a real problem, which will get addressed in a separate patch.
Diffstat (limited to 'pki/base/ca')
-rw-r--r-- | pki/base/ca/src/com/netscape/ca/CAService.java | 10 | ||||
-rw-r--r-- | pki/base/ca/src/com/netscape/ca/CRLIssuingPoint.java | 8 | ||||
-rw-r--r-- | pki/base/ca/src/com/netscape/ca/CertificateAuthority.java | 2 |
3 files changed, 10 insertions, 10 deletions
diff --git a/pki/base/ca/src/com/netscape/ca/CAService.java b/pki/base/ca/src/com/netscape/ca/CAService.java index 9297d421c..159539d45 100644 --- a/pki/base/ca/src/com/netscape/ca/CAService.java +++ b/pki/base/ca/src/com/netscape/ca/CAService.java @@ -1422,7 +1422,7 @@ class serviceRenewal implements IServant { if (metaInfo != null) { String renewed = (String) - metaInfo.get(certRecord.META_RENEWED_CERT); + metaInfo.get(ICertRecord.META_RENEWED_CERT); if (renewed != null) { BigInteger serial = new BigInteger(renewed); @@ -1891,7 +1891,7 @@ class serviceGetCRL implements IServant { throws EBaseException { try { ICRLIssuingPointRecord crlRec = - (ICRLIssuingPointRecord) mCA.getCRLRepository().readCRLIssuingPointRecord(mCA.PROP_MASTER_CRL); + (ICRLIssuingPointRecord) mCA.getCRLRepository().readCRLIssuingPointRecord(ICertificateAuthority.PROP_MASTER_CRL); X509CRLImpl crl = new X509CRLImpl(crlRec.getCRL()); request.setExtData(IRequest.CRL, crl.getEncoded()); @@ -1900,14 +1900,14 @@ class serviceGetCRL implements IServant { throw new ECAException( CMS.getUserMessage("CMS_CA_CRL_ISSUEPT_NOT_FOUND", e.toString())); } catch (CRLException e) { - mCA.log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_CA_GETCRL_INST_CRL", mCA.PROP_MASTER_CRL)); + mCA.log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_CA_GETCRL_INST_CRL", ICertificateAuthority.PROP_MASTER_CRL)); throw new ECAException( - CMS.getUserMessage("CMS_CA_CRL_ISSUEPT_NOGOOD", mCA.PROP_MASTER_CRL)); + CMS.getUserMessage("CMS_CA_CRL_ISSUEPT_NOGOOD", ICertificateAuthority.PROP_MASTER_CRL)); } catch (X509ExtensionException e) { mCA.log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_CA_GETCRL_NO_ISSUING_REC")); throw new ECAException( CMS.getUserMessage("CMS_CA_CRL_ISSUEPT_EXT_NOGOOD", - mCA.PROP_MASTER_CRL)); + ICertificateAuthority.PROP_MASTER_CRL)); } return true; } diff --git a/pki/base/ca/src/com/netscape/ca/CRLIssuingPoint.java b/pki/base/ca/src/com/netscape/ca/CRLIssuingPoint.java index f02d0905b..e939d03e6 100644 --- a/pki/base/ca/src/com/netscape/ca/CRLIssuingPoint.java +++ b/pki/base/ca/src/com/netscape/ca/CRLIssuingPoint.java @@ -449,8 +449,8 @@ public class CRLIssuingPoint implements ICRLIssuingPoint, Runnable { mConfigStore = config; - IConfigStore crlSubStore = mCA.getConfigStore().getSubStore(mCA.PROP_CRL_SUBSTORE); - mPageSize = crlSubStore.getInteger(mCA.PROP_CRL_PAGE_SIZE, CRL_PAGE_SIZE); + IConfigStore crlSubStore = mCA.getConfigStore().getSubStore(ICertificateAuthority.PROP_CRL_SUBSTORE); + mPageSize = crlSubStore.getInteger(ICertificateAuthority.PROP_CRL_PAGE_SIZE, CRL_PAGE_SIZE); CMS.debug("CRL Page Size: "+ mPageSize); mCountMod = config.getInteger("countMod",0); @@ -1154,10 +1154,10 @@ public class CRLIssuingPoint implements ICRLIssuingPoint, Runnable { if(onlyContainsCACerts != mCACertsOnly) { IConfigStore config = mCA.getConfigStore(); IConfigStore crlsSubStore = - config.getSubStore(mCA.PROP_CRL_SUBSTORE); + config.getSubStore(ICertificateAuthority.PROP_CRL_SUBSTORE); IConfigStore crlSubStore = crlsSubStore.getSubStore(mId); IConfigStore crlExtsSubStore = - crlSubStore.getSubStore(mCA.PROP_CRLEXT_SUBSTORE); + crlSubStore.getSubStore(ICertificateAuthority.PROP_CRLEXT_SUBSTORE); crlExtsSubStore = crlExtsSubStore.getSubStore(IssuingDistributionPointExtension.NAME); if(crlExtsSubStore != null) { diff --git a/pki/base/ca/src/com/netscape/ca/CertificateAuthority.java b/pki/base/ca/src/com/netscape/ca/CertificateAuthority.java index d8130b022..5353b019e 100644 --- a/pki/base/ca/src/com/netscape/ca/CertificateAuthority.java +++ b/pki/base/ca/src/com/netscape/ca/CertificateAuthority.java @@ -491,7 +491,7 @@ public class CertificateAuthority implements ICertificateAuthority, ICertAuthori * check if the ca is a clone. */ public boolean isClone() { - if (mService.mCLAConnector != null) + if (CAService.mCLAConnector != null) return true; else return false; |