diff options
Diffstat (limited to 'base/ca')
| -rw-r--r-- | base/ca/src/com/netscape/ca/CertificateAuthority.java | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/base/ca/src/com/netscape/ca/CertificateAuthority.java b/base/ca/src/com/netscape/ca/CertificateAuthority.java index f66192cf5..f8f3d7a9b 100644 --- a/base/ca/src/com/netscape/ca/CertificateAuthority.java +++ b/base/ca/src/com/netscape/ca/CertificateAuthority.java @@ -527,20 +527,19 @@ public class CertificateAuthority implements ICertificateAuthority, ICertAuthori CRLIssuingPoint point = (CRLIssuingPoint) enums.nextElement(); point.shutdown(); } + mCRLIssuePoints.clear(); if (mMasterCRLIssuePoint != null) { mMasterCRLIssuePoint.shutdown(); } - mSigningUnit = null; - mOCSPSigningUnit = null; - mCRLSigningUnit = null; if (mCertRepot != null) { mCertRepot.shutdown(); - mCertRepot = null; } - mCRLRepot = null; - mPublisherProcessor.shutdown(); + + if (mPublisherProcessor != null) { + mPublisherProcessor.shutdown(); + } } /** @@ -1695,12 +1694,12 @@ public class CertificateAuthority implements ICertificateAuthority, ICertAuthori } // a Master/full crl must exist. + CRLIssuingPoint masterCRLIssuePoint = null; while (issuePointIdEnum.hasMoreElements()) { String issuePointId = issuePointIdEnum.nextElement(); - CMS.debug( - "initializing crl issue point " + issuePointId); + CMS.debug("initializing crl issue point " + issuePointId); IConfigStore issuePointConfig = null; String issuePointClassName = null; Class<CRLIssuingPoint> issuePointClass = null; @@ -1713,9 +1712,11 @@ public class CertificateAuthority implements ICertificateAuthority, ICertAuthori issuePoint = issuePointClass.newInstance(); issuePoint.init(this, issuePointId, issuePointConfig); mCRLIssuePoints.put(issuePointId, issuePoint); - if (mMasterCRLIssuePoint == null && + + if (masterCRLIssuePoint == null && issuePointId.equals(PROP_MASTER_CRL)) - mMasterCRLIssuePoint = issuePoint; + masterCRLIssuePoint = issuePoint; + } catch (ClassNotFoundException e) { throw new ECAException( CMS.getUserMessage("CMS_CA_CRL_ISSUING_POINT_INIT_FAILED", @@ -1731,6 +1732,8 @@ public class CertificateAuthority implements ICertificateAuthority, ICertAuthori } } + mMasterCRLIssuePoint = masterCRLIssuePoint; + /* if (mMasterCRLIssuePoint == null) { log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_CA_CA_NO_FULL_CRL", PROP_MASTER_CRL)); |