summaryrefslogtreecommitdiffstats
path: root/base/server/cms/src/com
diff options
context:
space:
mode:
Diffstat (limited to 'base/server/cms/src/com')
-rw-r--r--base/server/cms/src/com/netscape/cms/servlet/csadmin/ConfigurationUtils.java13
1 files changed, 10 insertions, 3 deletions
diff --git a/base/server/cms/src/com/netscape/cms/servlet/csadmin/ConfigurationUtils.java b/base/server/cms/src/com/netscape/cms/servlet/csadmin/ConfigurationUtils.java
index 992ccc105..cdb284495 100644
--- a/base/server/cms/src/com/netscape/cms/servlet/csadmin/ConfigurationUtils.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/csadmin/ConfigurationUtils.java
@@ -2947,10 +2947,17 @@ public class ConfigurationUtils {
cert.setDN(subjectDN);
String subsystem = config.getString(PCERT_PREFIX + tag + ".subsystem");
- String certreq = config.getString(subsystem + "." + tag + ".certreq");
- String formattedCertreq = CryptoUtil.reqFormat(certreq);
- cert.setRequest(formattedCertreq);
+ try {
+ String certreq = config.getString(subsystem + "." + tag + ".certreq");
+ String formattedCertreq = CryptoUtil.reqFormat(certreq);
+
+ cert.setRequest(formattedCertreq);
+
+ } catch (EPropertyNotFound e) {
+ // The CSR is optional for existing CA case.
+ CMS.debug("ConfigurationUtils.loadCertRequest: " + tag + " cert has no CSR");
+ }
}
public static void generateCertRequest(IConfigStore config, String certTag, Cert cert) throws Exception {