From 4a012010233b0a5fd613c9d7734ee01be64e3834 Mon Sep 17 00:00:00 2001 From: Abhishek Koneru Date: Tue, 5 Jun 2012 12:16:51 -0400 Subject: Fixes for NULL_RETURN cases review comments --- .../common/src/com/netscape/cmscore/security/CertificateInfo.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'base/common/src/com/netscape/cmscore/security') diff --git a/base/common/src/com/netscape/cmscore/security/CertificateInfo.java b/base/common/src/com/netscape/cmscore/security/CertificateInfo.java index 040abc3c2..fef733a11 100644 --- a/base/common/src/com/netscape/cmscore/security/CertificateInfo.java +++ b/base/common/src/com/netscape/cmscore/security/CertificateInfo.java @@ -187,10 +187,10 @@ public abstract class CertificateInfo { if (algm == null) { String hashtype = (String) mProperties.get(ConfigConstants.PR_HASH_TYPE); - - algm = KeyCertUtil.getSigningAlgorithm(getKeyAlgorithm(), hashtype); + String key = getKeyAlgorithm(); + algm = KeyCertUtil.getSigningAlgorithm(key, hashtype); if (algm == null) { - throw new NoSuchAlgorithmException(); + throw new NoSuchAlgorithmException("No Algorithm for Key : " + key + " and Hashtype : " + hashtype); } mProperties.put(Constants.PR_SIGNATURE_ALGORITHM, algm); } @@ -212,7 +212,7 @@ public abstract class CertificateInfo { } catch (IOException e) { throw new EBaseException(CMS.getUserMessage("CMS_BASE_INVALID_CERT", e.toString())); } catch (NoSuchAlgorithmException e) { - throw new EBaseException(CMS.getUserMessage("CMS_BASE_ALG_NOT_SUPPORTED", "")); + throw new EBaseException(CMS.getUserMessage("CMS_BASE_ALG_NOT_SUPPORTED", e.toString())); } return certInfo; -- cgit