summaryrefslogtreecommitdiffstats
path: root/base/ca
diff options
context:
space:
mode:
authorAbhishek Koneru <akoneru@redhat.com>2012-06-26 15:37:15 -0400
committerEndi Sukma Dewata <edewata@redhat.com>2012-07-02 12:44:05 -0500
commit0f3451befbc14bd6ec29d9e1e3845f970f288653 (patch)
tree346822835936131b9dc6c5fd8692ce9c60eeda03 /base/ca
parent10502e34a10fb3b672aef1161cc271003c7806ba (diff)
downloadpki-0f3451befbc14bd6ec29d9e1e3845f970f288653.tar.gz
pki-0f3451befbc14bd6ec29d9e1e3845f970f288653.tar.xz
pki-0f3451befbc14bd6ec29d9e1e3845f970f288653.zip
LeftOver Cases in Resource Leaks and NULL_RETURNS
Diffstat (limited to 'base/ca')
-rw-r--r--base/ca/src/com/netscape/ca/CAService.java11
-rw-r--r--base/ca/src/com/netscape/ca/CertificateAuthority.java4
2 files changed, 7 insertions, 8 deletions
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());
}
}