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/02/03 12:59:43 UTC

svn commit: r1563852 - /webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/EncryptedKeyProcessor.java

Author: coheigea
Date: Mon Feb  3 11:59:42 2014
New Revision: 1563852

URL: http://svn.apache.org/r1563852
Log:
Fixing NPE

Modified:
    webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/EncryptedKeyProcessor.java

Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/EncryptedKeyProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/EncryptedKeyProcessor.java?rev=1563852&r1=1563851&r2=1563852&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/EncryptedKeyProcessor.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/EncryptedKeyProcessor.java Mon Feb  3 11:59:42 2014
@@ -105,6 +105,7 @@ public class EncryptedKeyProcessor imple
         }
         if (WSConstants.KEYTRANSPORT_RSA15.equals(encryptedKeyTransportMethod)
             && !data.isAllowRSA15KeyTransportAlgorithm()
+            && algorithmSuite != null
             && !algorithmSuite.getKeyWrapAlgorithms().contains(WSConstants.KEYTRANSPORT_RSA15)) {
             LOG.debug(
                 "The Key transport method does not match the requirement"