diff options
| author | Ade Lee <alee@redhat.com> | 2012-01-09 23:04:22 -0500 |
|---|---|---|
| committer | Ade Lee <alee@redhat.com> | 2012-01-11 13:50:04 -0500 |
| commit | f845fe269878552182bd201065ddfc3982583e50 (patch) | |
| tree | 3924e3c72010e631340f8510881dd001d9d6aa80 /pki/base/common/src/com/netscape/cmscore | |
| parent | f31ce3a1378071cc413bb01a65ae6e206f0ce4ff (diff) | |
| download | pki-f845fe269878552182bd201065ddfc3982583e50.tar.gz pki-f845fe269878552182bd201065ddfc3982583e50.tar.xz pki-f845fe269878552182bd201065ddfc3982583e50.zip | |
Formatting - fix bad wraps
Diffstat (limited to 'pki/base/common/src/com/netscape/cmscore')
| -rw-r--r-- | pki/base/common/src/com/netscape/cmscore/dbs/CertificateRepository.java | 6 | ||||
| -rw-r--r-- | pki/base/common/src/com/netscape/cmscore/ldap/PublisherProcessor.java | 16 |
2 files changed, 10 insertions, 12 deletions
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 5a5de68dc..f80889d91 100644 --- a/pki/base/common/src/com/netscape/cmscore/dbs/CertificateRepository.java +++ b/pki/base/common/src/com/netscape/cmscore/dbs/CertificateRepository.java @@ -1657,8 +1657,9 @@ public class CertificateRepository extends Repository throws EBaseException { IDBSSession s = mDBService.createSession(); Enumeration e = null; + // index is setup for this filter String ldapfilter = "(|(" + CertRecord.ATTR_CERT_STATUS + "=" + CertRecord.STATUS_REVOKED + ")(" - + CertRecord.ATTR_CERT_STATUS + "=" + CertRecord.STATUS_REVOKED_EXPIRED + "))"; // index is setup for this filter + + CertRecord.ATTR_CERT_STATUS + "=" + CertRecord.STATUS_REVOKED_EXPIRED + "))"; try { //e = s.search(getDN(), ldapfilter); @@ -1720,8 +1721,9 @@ public class CertificateRepository extends Repository throws EBaseException { IDBSSession s = mDBService.createSession(); Enumeration e = null; + // index is setup for this filter String ldapfilter = "(&(|(" + CertRecord.ATTR_CERT_STATUS + "=" + CertRecord.STATUS_REVOKED + ")(" - + CertRecord.ATTR_CERT_STATUS + "=" + CertRecord.STATUS_REVOKED_EXPIRED + "))"; // index is setup for this filter + + CertRecord.ATTR_CERT_STATUS + "=" + CertRecord.STATUS_REVOKED_EXPIRED + "))"; ldapfilter += "(certMetainfo=" + CertRecord.META_LDAPPUBLISH + 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 73d206981..a0bc2d145 100644 --- a/pki/base/common/src/com/netscape/cmscore/ldap/PublisherProcessor.java +++ b/pki/base/common/src/com/netscape/cmscore/ldap/PublisherProcessor.java @@ -838,16 +838,12 @@ public class PublisherProcessor implements } catch (EBaseException e) { // not fatal. just log warning. log(ILogger.LL_WARN, - "Cannot mark cert 0x" - + serialNo.toString(16) - + " published as " - + published - + - " in the ldap directory. Cert Record not found. Error: " - + - e.toString() - + - " Don't be alarmed if it's a subordinate ca or clone's ca siging cert. Otherwise your internal db may be corrupted."); + "Cannot mark cert 0x" + serialNo.toString(16) + + " published as " + published + + " in the ldap directory. Cert Record not found. Error: " + + e.toString() + + " Don't be alarmed if it's a subordinate ca or clone's ca siging cert. " + + "Otherwise your internal db may be corrupted."); } } |