diff options
author | Ade Lee <alee@redhat.com> | 2011-12-08 21:15:11 -0500 |
---|---|---|
committer | Ade Lee <alee@redhat.com> | 2011-12-08 21:15:11 -0500 |
commit | adad2fcee8a29fdb82376fbce07dedb11fccc182 (patch) | |
tree | 52dd96f664a6fa51be25b28b6f10adc5f2c9f660 /pki/base/ca | |
parent | 0b5c0e0542354edc8cab4da6a1afa1ff00800c0c (diff) | |
download | pki-adad2fcee8a29fdb82376fbce07dedb11fccc182.tar.gz pki-adad2fcee8a29fdb82376fbce07dedb11fccc182.tar.xz pki-adad2fcee8a29fdb82376fbce07dedb11fccc182.zip |
Revert "Indent in conditionals"
This reverts commit 0b5c0e0542354edc8cab4da6a1afa1ff00800c0c.
Diffstat (limited to 'pki/base/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 2c03f89d4..44ab65bcf 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 5ee163d9b..064832fe4 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()))) { |