From 0f3451befbc14bd6ec29d9e1e3845f970f288653 Mon Sep 17 00:00:00 2001 From: Abhishek Koneru Date: Tue, 26 Jun 2012 15:37:15 -0400 Subject: LeftOver Cases in Resource Leaks and NULL_RETURNS --- base/ca/src/com/netscape/ca/CAService.java | 11 +++++------ base/ca/src/com/netscape/ca/CertificateAuthority.java | 4 ++-- 2 files changed, 7 insertions(+), 8 deletions(-) (limited to 'base/ca') diff --git a/base/ca/src/com/netscape/ca/CAService.java b/base/ca/src/com/netscape/ca/CAService.java index 12011ced4..19778505e 100644 --- a/base/ca/src/com/netscape/ca/CAService.java +++ b/base/ca/src/com/netscape/ca/CAService.java @@ -1927,15 +1927,14 @@ class serviceGetRevocationInfo implements IServant { while (enum1.hasMoreElements()) { String name = enum1.nextElement(); - + RevocationInfo info = null; if (name.equals(IRequest.ISSUED_CERTS)) { X509CertImpl certsToCheck[] = request.getExtDataInCertArray(IRequest.ISSUED_CERTS); - - CertificateRepository certDB = (CertificateRepository) mCA.getCertificateRepository(); - RevocationInfo info = - certDB.isCertificateRevoked(certsToCheck[0]); - + if (certsToCheck != null) { + CertificateRepository certDB = (CertificateRepository) mCA.getCertificateRepository(); + info = certDB.isCertificateRevoked(certsToCheck[0]); + } if (info != null) { RevokedCertImpl revokedCerts[] = new RevokedCertImpl[1]; RevokedCertImpl revokedCert = new RevokedCertImpl( diff --git a/base/ca/src/com/netscape/ca/CertificateAuthority.java b/base/ca/src/com/netscape/ca/CertificateAuthority.java index feecec6a8..f66192cf5 100644 --- a/base/ca/src/com/netscape/ca/CertificateAuthority.java +++ b/base/ca/src/com/netscape/ca/CertificateAuthority.java @@ -1896,7 +1896,7 @@ public class CertificateAuthority implements ICertificateAuthority, ICertAuthori return response; } catch (Exception e) { log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_CA_CA_OCSP_REQUEST", e.toString())); - return null; + throw new EBaseException(e.toString()); } } @@ -1940,7 +1940,7 @@ public class CertificateAuthority implements ICertificateAuthority, ICertAuthori e.printStackTrace(); // error e log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_CA_CA_OCSP_SIGN", e.toString())); - return null; + throw new EBaseException(e.toString()); } } -- cgit