git-svn-id: https://svn.apache.org/repos/asf/santuario/xml-security-java/branches/2.1.x-fixes@1876555 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMKeyInfoFactory.java b/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMKeyInfoFactory.java
index 691a6d1..dbcad26 100644
--- a/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMKeyInfoFactory.java
+++ b/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMKeyInfoFactory.java
@@ -166,9 +166,15 @@
"support DOM Level 2 and be namespace aware");
}
if ("KeyInfo".equals(tag) && XMLSignature.XMLNS.equals(namespace)) {
- return new DOMKeyInfo(element, new UnmarshalContext(), getProvider());
+ try {
+ return new DOMKeyInfo(element, new UnmarshalContext(), getProvider());
+ } catch (MarshalException me) {
+ throw me;
+ } catch (Exception e) {
+ throw new MarshalException(e);
+ }
} else {
- throw new MarshalException("invalid KeyInfo tag: " + namespace + ":" + tag);
+ throw new MarshalException("Invalid KeyInfo tag: " + namespace + ":" + tag);
}
}
diff --git a/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLSignatureFactory.java b/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLSignatureFactory.java
index 90aa97a..f3863d8 100644
--- a/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLSignatureFactory.java
+++ b/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLSignatureFactory.java
@@ -188,9 +188,15 @@
"support DOM Level 2 and be namespace aware");
}
if ("Signature".equals(tag) && XMLSignature.XMLNS.equals(namespace)) {
- return new DOMXMLSignature(element, context, getProvider());
+ try {
+ return new DOMXMLSignature(element, context, getProvider());
+ } catch (MarshalException me) {
+ throw me;
+ } catch (Exception e) {
+ throw new MarshalException(e);
+ }
} else {
- throw new MarshalException("invalid Signature tag: " + namespace + ":" + tag);
+ throw new MarshalException("Invalid Signature tag: " + namespace + ":" + tag);
}
}
