From 80fa9eefaeaeea94c650400f914b5831f1e28261 Mon Sep 17 00:00:00 2001
From: "Endi S. Dewata" <edewata@redhat.com>
Date: Fri, 1 Apr 2016 03:10:41 +0200
Subject: Fixed exception handling in CertInfoProfile.

The CertInfoProfile.populate() has been modified to re-throw the
exception instead of ignoring it.

https://fedorahosted.org/pki/ticket/1654
---
 .../com/netscape/certsrv/profile/CertInfoProfile.java   | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/base/common/src/com/netscape/certsrv/profile/CertInfoProfile.java b/base/common/src/com/netscape/certsrv/profile/CertInfoProfile.java
index 907d8d631..566184d1a 100644
--- a/base/common/src/com/netscape/certsrv/profile/CertInfoProfile.java
+++ b/base/common/src/com/netscape/certsrv/profile/CertInfoProfile.java
@@ -21,12 +21,12 @@ import java.util.Enumeration;
 import java.util.StringTokenizer;
 import java.util.Vector;
 
-import netscape.security.x509.X509CertInfo;
-
 import com.netscape.certsrv.apps.CMS;
 import com.netscape.certsrv.base.IConfigStore;
 import com.netscape.certsrv.request.IRequest;
 
+import netscape.security.x509.X509CertInfo;
+
 public class CertInfoProfile {
     private Vector<ICertInfoPolicyDefault> mDefaults = new Vector<ICertInfoPolicyDefault>();
     private String mName = null;
@@ -87,19 +87,20 @@ public class CertInfoProfile {
         return mProfileSetIDMapping;
     }
 
-    public void populate(X509CertInfo info) {
-        populate( null /* request */, info);
+    public void populate(X509CertInfo info) throws Exception {
+        populate(null /* request */, info);
     }
 
-    public void populate(IRequest request, X509CertInfo info) {
+    public void populate(IRequest request, X509CertInfo info) throws Exception {
         Enumeration<ICertInfoPolicyDefault> e1 = mDefaults.elements();
         while (e1.hasMoreElements()) {
             ICertInfoPolicyDefault def = e1.nextElement();
             try {
-                def.populate( request, info);
+                CMS.debug("CertInfoProfile: Populating certificate with " + def.getClass().getName());
+                def.populate(request, info);
             } catch (Exception e) {
-                CMS.debug(e);
-                CMS.debug("CertInfoProfile.populate: " + e.toString());
+                CMS.debug("CertInfoProfile: Unable to populate certificate: " + e);
+                throw e;
             }
         }
     }
-- 
cgit