You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by co...@apache.org on 2014/01/20 15:03:27 UTC

svn commit: r1559698 - /webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SAMLTokenOutputProcessor.java

Author: coheigea
Date: Mon Jan 20 14:03:27 2014
New Revision: 1559698

URL: http://svn.apache.org/r1559698
Log:
Fixing possible NPE

Modified:
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SAMLTokenOutputProcessor.java

Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SAMLTokenOutputProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SAMLTokenOutputProcessor.java?rev=1559698&r1=1559697&r2=1559698&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SAMLTokenOutputProcessor.java (original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SAMLTokenOutputProcessor.java Mon Jan 20 14:03:27 2014
@@ -384,7 +384,8 @@ public class SAMLTokenOutputProcessor ex
 
                 OutputProcessorChain subOutputProcessorChain = outputProcessorChain.createSubChain(this);
                 if (senderVouches && getSecurityProperties().getSignatureKeyIdentifier() ==
-                        WSSecurityTokenConstants.KeyIdentifier_SecurityTokenDirectReference) {
+                        WSSecurityTokenConstants.KeyIdentifier_SecurityTokenDirectReference
+                        && securityToken != null) {
 
                     WSSUtils.updateSecurityHeaderOrder(
                             outputProcessorChain, WSSConstants.TAG_wsse_BinarySecurityToken, getAction(), false);