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

[co...@apache.org]

Author: coheigea
Date: Thu Nov  3 15:15:21 2011
New Revision: 1197177

URL: http://svn.apache.org/viewvc?rev=1197177&view=rev
Log:
Fixing a NPE in DOMKeyInfo

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

Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMKeyInfoFactory.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMKeyInfoFactory.java?rev=1197177&r1=1197176&r2=1197177&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMKeyInfoFactory.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMKeyInfoFactory.java Thu Nov  3 15:15:21 2011
@@ -29,6 +29,7 @@ import java.security.KeyException;
 import java.security.PublicKey;
 import java.util.List;
 import javax.xml.crypto.*;
+import javax.xml.crypto.dom.DOMCryptoContext;
 import javax.xml.crypto.dsig.keyinfo.*;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -139,9 +140,14 @@ public final class DOMKeyInfoFactory ext
                 "support DOM Level 2 and be namespace aware");
         }
         if (tag.equals("KeyInfo")) {
-            return new DOMKeyInfo(element, null, getProvider());
+            return new DOMKeyInfo(element, new UnmarshalContext(), getProvider());
         } else {
             throw new MarshalException("invalid KeyInfo tag: " + tag);
         }
     }
+    
+    private static class UnmarshalContext extends DOMCryptoContext {
+        UnmarshalContext() {}
+    }
+
 }