diff options
Diffstat (limited to 'base/common/src/com/netscape/certsrv/dbs/keydb')
-rw-r--r-- | base/common/src/com/netscape/certsrv/dbs/keydb/KeyIdAdapter.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/base/common/src/com/netscape/certsrv/dbs/keydb/KeyIdAdapter.java b/base/common/src/com/netscape/certsrv/dbs/keydb/KeyIdAdapter.java index 3232999fd..0f0c43c82 100644 --- a/base/common/src/com/netscape/certsrv/dbs/keydb/KeyIdAdapter.java +++ b/base/common/src/com/netscape/certsrv/dbs/keydb/KeyIdAdapter.java @@ -19,19 +19,20 @@ package com.netscape.certsrv.dbs.keydb; import javax.xml.bind.annotation.adapters.XmlAdapter; +import org.apache.commons.lang.StringUtils; + /** * The KeyIdAdapter class provides custom marshaling for KeyId. * * @author Endi S. Dewata - * @version $Revision$ $Date$ */ public class KeyIdAdapter extends XmlAdapter<String, KeyId> { public KeyId unmarshal(String value) throws Exception { - return new KeyId(value); + return StringUtils.isEmpty(value) ? null : new KeyId(value); } public String marshal(KeyId value) throws Exception { - return value.toString(); + return value == null ? null : value.toString(); } } |