diff options
Diffstat (limited to 'pki/base/ca/src/com/netscape/ca')
-rw-r--r-- | pki/base/ca/src/com/netscape/ca/CAService.java | 2 | ||||
-rw-r--r-- | pki/base/ca/src/com/netscape/ca/CRLIssuingPoint.java | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pki/base/ca/src/com/netscape/ca/CAService.java b/pki/base/ca/src/com/netscape/ca/CAService.java index 44ab65bc..2c03f89d 100644 --- a/pki/base/ca/src/com/netscape/ca/CAService.java +++ b/pki/base/ca/src/com/netscape/ca/CAService.java @@ -489,7 +489,7 @@ public class CAService implements ICAService, IService { if (!(type.equals(IRequest.REVOCATION_REQUEST) || type.equals(IRequest.UNREVOCATION_REQUEST) || type - .equals(IRequest.CMCREVOKE_REQUEST))) { + .equals(IRequest.CMCREVOKE_REQUEST))) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( LOGGING_SIGNED_AUDIT_PRIVATE_KEY_ARCHIVE_REQUEST, diff --git a/pki/base/ca/src/com/netscape/ca/CRLIssuingPoint.java b/pki/base/ca/src/com/netscape/ca/CRLIssuingPoint.java index 064832fe..5ee163d9 100644 --- a/pki/base/ca/src/com/netscape/ca/CRLIssuingPoint.java +++ b/pki/base/ca/src/com/netscape/ca/CRLIssuingPoint.java @@ -2355,7 +2355,7 @@ public class CRLIssuingPoint implements ICRLIssuingPoint, Runnable { .isCRLExtensionEnabled(DeltaCRLIndicatorExtension.NAME) && mCMSCRLExtensions .isCRLExtensionEnabled(CRLNumberExtension.NAME) && mCMSCRLExtensions - .isCRLExtensionEnabled(CRLReasonExtension.NAME)); + .isCRLExtensionEnabled(CRLReasonExtension.NAME)); } public boolean isThisCurrentDeltaCRL(X509CRLImpl deltaCRL) { @@ -2544,7 +2544,7 @@ public class CRLIssuingPoint implements ICRLIssuingPoint, Runnable { || ((mCRLCacheIsCleared && mCRLCerts.isEmpty() && clonedRevokedCerts.isEmpty() && clonedUnrevokedCerts.isEmpty() && clonedExpiredCerts - .isEmpty()) + .isEmpty()) || (mCRLCerts.isEmpty() && (!clonedUnrevokedCerts .isEmpty())) || (mCRLCerts.size() < clonedUnrevokedCerts.size()) @@ -2716,7 +2716,7 @@ public class CRLIssuingPoint implements ICRLIssuingPoint, Runnable { if (mSchemaCounter == 0) { if (((!mCRLCerts.isEmpty()) && ((!clonedRevokedCerts.isEmpty()) || (!clonedUnrevokedCerts.isEmpty()) || (!clonedExpiredCerts - .isEmpty()))) + .isEmpty()))) || (mCRLCerts.isEmpty() && (mCRLSize == 0) && (!clonedRevokedCerts .isEmpty()))) { |