summaryrefslogtreecommitdiffstats
path: root/base/server/cms/src/com/netscape/cms
diff options
context:
space:
mode:
authorEndi S. Dewata <edewata@redhat.com>2014-06-19 17:48:03 -0400
committerEndi S. Dewata <edewata@redhat.com>2014-06-20 15:55:07 -0400
commit6bb64604f3422e1c4f72a14707bfb6ffbeb23458 (patch)
treec17129614611c4ca95bed8c936cf86c033453816 /base/server/cms/src/com/netscape/cms
parentae94ccc0164c6e8bdf30a0946c3003438254d85d (diff)
downloadpki-6bb64604f3422e1c4f72a14707bfb6ffbeb23458.tar.gz
pki-6bb64604f3422e1c4f72a14707bfb6ffbeb23458.tar.xz
pki-6bb64604f3422e1c4f72a14707bfb6ffbeb23458.zip
Fixed NumberFormatException in key-request-find.
Previously if a key archival failed, the REST service would return an invalid key URL, which would cause an exception when the CLI tried to parse it. The service has been fixed to return a null URL which can be detected to avoid parsing invalid value. The Python library has been modified to handle missing key URL. Ticket #1043
Diffstat (limited to 'base/server/cms/src/com/netscape/cms')
-rw-r--r--base/server/cms/src/com/netscape/cms/servlet/key/KeyRequestDAO.java11
1 files changed, 7 insertions, 4 deletions
diff --git a/base/server/cms/src/com/netscape/cms/servlet/key/KeyRequestDAO.java b/base/server/cms/src/com/netscape/cms/servlet/key/KeyRequestDAO.java
index 3686ec776..dd0393aab 100644
--- a/base/server/cms/src/com/netscape/cms/servlet/key/KeyRequestDAO.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/key/KeyRequestDAO.java
@@ -351,11 +351,14 @@ public class KeyRequestDAO extends CMSRequestDAO {
ret.setRequestURL(reqBuilder.build().toString());
Path keyPath = KeyResource.class.getAnnotation(Path.class);
- String kid = request.getExtDataInString("keyrecord");
+ String keyID = request.getExtDataInString("keyrecord");
- UriBuilder keyBuilder = uriInfo.getBaseUriBuilder();
- keyBuilder.path(keyPath.value() + "/" + kid);
- ret.setKeyURL(keyBuilder.build().toString());
+ if (keyID != null) {
+ // set key URL only if key ID is available
+ UriBuilder keyBuilder = uriInfo.getBaseUriBuilder();
+ keyBuilder.path(keyPath.value() + "/" + keyID);
+ ret.setKeyURL(keyBuilder.build().toString());
+ }
return ret;
}