svn commit: r1497077 - /santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLSignatureFactory.java

[mu...@apache.org]

Author: mullan
Date: Wed Jun 26 20:23:42 2013
New Revision: 1497077

URL: http://svn.apache.org/r1497077
Log:
unmarshalXMLSignature should throw NPE if xmlStructure is null as specified by the XMLSignatureFactory API.
Initialize XMLStructure params passed to newCanonicalizationMethod.

Modified:
    santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLSignatureFactory.java

Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLSignatureFactory.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLSignatureFactory.java?rev=1497077&r1=1497076&r2=1497077&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLSignatureFactory.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLSignatureFactory.java Wed Jun 26 20:23:42 2013
@@ -164,7 +164,10 @@ public final class DOMXMLSignatureFactor
     public XMLSignature unmarshalXMLSignature(XMLStructure xmlStructure)
         throws MarshalException {
 
-        if (xmlStructure == null || !(xmlStructure instanceof javax.xml.crypto.dom.DOMStructure)) {
+        if (xmlStructure == null) {
+            throw new NullPointerException("xmlStructure cannot be null");
+        }
+        if (!(xmlStructure instanceof javax.xml.crypto.dom.DOMStructure)) {
             throw new ClassCastException("xmlStructure must be of type DOMStructure");
         }
         return unmarshal
@@ -347,6 +350,11 @@ public final class DOMXMLSignatureFactor
                 spi = TransformService.getInstance(algorithm, "DOM");
             }
         }
+        if (params == null) {
+            spi.init(null);
+        } else {
+            spi.init(params, null);
+        }
         
         return new DOMCanonicalizationMethod(spi);
     }