diff options
author | Ade Lee <alee@redhat.com> | 2012-04-13 13:51:32 -0400 |
---|---|---|
committer | Ade Lee <alee@redhat.com> | 2012-05-01 17:22:38 -0400 |
commit | 80aff97bedf8c2ee5f58209f36f18ebbc475ccb1 (patch) | |
tree | 7a4e6a79f0e29c0596c81aaef47009d66cb56ccf /base/common/src/com/netscape/cms/servlet/csadmin/CertUtil.java | |
parent | dd566ed3c64a69801a9edf3b27f11077aa40ecef (diff) | |
download | pki-80aff97bedf8c2ee5f58209f36f18ebbc475ccb1.tar.gz pki-80aff97bedf8c2ee5f58209f36f18ebbc475ccb1.tar.xz pki-80aff97bedf8c2ee5f58209f36f18ebbc475ccb1.zip |
RESTful servlet to configure system in a single servlet.
Installation code common to the panels and the installation servlet are extracted to a
ConfigurationUtils file. The panel code will be cleaned up to use the code in this
class in a later commit.
Contains restful client and test driver code. The test driver code should be modified
and placed in a junit/system test framework. Installation has been tested to work with
the following installations: master CA, clone CA, KRA, OCSP, TKS, subordinate CA, CA
signed by external CA (parts 1 and 2).
Ticket #155
Diffstat (limited to 'base/common/src/com/netscape/cms/servlet/csadmin/CertUtil.java')
-rw-r--r-- | base/common/src/com/netscape/cms/servlet/csadmin/CertUtil.java | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/CertUtil.java b/base/common/src/com/netscape/cms/servlet/csadmin/CertUtil.java index e3068d7b3..35ec7c515 100644 --- a/base/common/src/com/netscape/cms/servlet/csadmin/CertUtil.java +++ b/base/common/src/com/netscape/cms/servlet/csadmin/CertUtil.java @@ -194,7 +194,9 @@ public class CertUtil { return certReqs; } catch (Throwable e) { CMS.debug(e); - context.put("errorString", e.toString()); + if (context != null) { + context.put("errorString", e.toString()); + } CMS.debug("CertUtil getPKCS10: " + e.toString()); throw new IOException(e.toString()); } @@ -453,8 +455,9 @@ public class CertUtil { } if (cr == null) { - context.put("errorString", - "Ceritifcate Authority is not ready to serve."); + if (context != null) { + context.put("errorString", "Ceritifcate Authority is not ready to serve."); + } throw new IOException("Ceritifcate Authority is not ready to serve."); } |