You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@santuario.apache.org by co...@apache.org on 2014/04/22 11:52:53 UTC
svn commit: r1589059 -
/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLSignature.java
Author: coheigea
Date: Tue Apr 22 09:52:53 2014
New Revision: 1589059
URL: http://svn.apache.org/r1589059
Log:
[SANTUARIO-383] - NPE in DOMXMLSignature
Modified:
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLSignature.java
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLSignature.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLSignature.java?rev=1589059&r1=1589058&r2=1589059&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLSignature.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXMLSignature.java Tue Apr 22 09:52:53 2014
@@ -536,11 +536,16 @@ public final class DOMXMLSignature exten
// get validating key
SignatureMethod sm = si.getSignatureMethod();
Key validationKey = null;
- KeySelectorResult ksResult;
+ KeySelectorResult ksResult = null;
try {
- ksResult = validateContext.getKeySelector().select
- (ki, KeySelector.Purpose.VERIFY, sm, validateContext);
- validationKey = ksResult.getKey();
+ KeySelector keySelector = validateContext.getKeySelector();
+ if (keySelector != null) {
+ ksResult = keySelector.select
+ (ki, KeySelector.Purpose.VERIFY, sm, validateContext);
+ if (ksResult != null) {
+ validationKey = ksResult.getKey();
+ }
+ }
if (validationKey == null) {
throw new XMLSignatureException("the keyselector did not " +
"find a validation key");