Author: coheigea
Date: Wed Apr 9 17:52:55 2014
New Revision: 1586055
URL: http://svn.apache.org/r1586055
Log:
Fix NPE in SAML Signature code
Modified:
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/saml/WSSecSignatureSAML.java
Modified:
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/saml/WSSecSignatureSAML.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/saml/WSSecSignatureSAML.java?rev=1586055&r1=1586054&r2=1586055&view=diff
==============================================================================
---
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/saml/WSSecSignatureSAML.java
(original)
+++
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/saml/WSSecSignatureSAML.java
Wed Apr 9 17:52:55 2014
@@ -265,9 +265,11 @@ public class WSSecSignatureSAML extends
samlAssertion, new WSSSAMLKeyInfoProcessor(data,
wsDocInfo),
userCrypto, data.getCallbackHandler()
);
- publicKey = samlKeyInfo.getPublicKey();
- certs = samlKeyInfo.getCerts();
- wsDocInfo.setCrypto(userCrypto);
+ if (samlKeyInfo != null) {
+ publicKey = samlKeyInfo.getPublicKey();
+ certs = samlKeyInfo.getCerts();
+ wsDocInfo.setCrypto(userCrypto);
+ }
}
}
if ((certs == null || certs.length == 0 || certs[0] == null)
