You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@santuario.apache.org by mu...@apache.org on 2020/04/15 13:55:24 UTC
svn commit: r1876555 - in
/santuario/xml-security-java/branches/2.1.x-fixes/src/main/java/org/apache/jcp/xml/dsig/internal/dom:
DOMKeyInfoFactory.java DOMXMLSignatureFactory.java
Author: mullan
Date: Wed Apr 15 13:55:24 2020
New Revision: 1876555
URL: http://svn.apache.org/viewvc?rev=1876555&view=rev
Log: (empty)
Modified:
santuario/xml-security-java/branches/2.1.x-fixes/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMKeyInfoFactory.java
santuario/xml-security-java/branches/2.1.x-fixes/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLSignatureFactory.java
Modified: santuario/xml-security-java/branches/2.1.x-fixes/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMKeyInfoFactory.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/branches/2.1.x-fixes/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMKeyInfoFactory.java?rev=1876555&r1=1876554&r2=1876555&view=diff
==============================================================================
--- santuario/xml-security-java/branches/2.1.x-fixes/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMKeyInfoFactory.java (original)
+++ santuario/xml-security-java/branches/2.1.x-fixes/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMKeyInfoFactory.java Wed Apr 15 13:55:24 2020
@@ -166,9 +166,15 @@ public final class DOMKeyInfoFactory ext
"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);
}
}
Modified: santuario/xml-security-java/branches/2.1.x-fixes/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLSignatureFactory.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/branches/2.1.x-fixes/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLSignatureFactory.java?rev=1876555&r1=1876554&r2=1876555&view=diff
==============================================================================
--- santuario/xml-security-java/branches/2.1.x-fixes/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLSignatureFactory.java (original)
+++ santuario/xml-security-java/branches/2.1.x-fixes/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLSignatureFactory.java Wed Apr 15 13:55:24 2020
@@ -188,9 +188,15 @@ public final class DOMXMLSignatureFactor
"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);
}
}