ws-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject svn commit: r1753484 - /webservices/wss4j/branches/2_0_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/Merlin.java
Date Wed, 20 Jul 2016 10:49:55 GMT
Author: coheigea
Date: Wed Jul 20 10:49:55 2016
New Revision: 1753484

URL: http://svn.apache.org/viewvc?rev=1753484&view=rev
Log:
NPE fix

Modified:
    webservices/wss4j/branches/2_0_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/Merlin.java

Modified: webservices/wss4j/branches/2_0_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/Merlin.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/2_0_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/Merlin.java?rev=1753484&r1=1753483&r2=1753484&view=diff
==============================================================================
--- webservices/wss4j/branches/2_0_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/Merlin.java
(original)
+++ webservices/wss4j/branches/2_0_x-fixes/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/Merlin.java
Wed Jul 20 10:49:55 2016
@@ -1315,6 +1315,9 @@ public class Merlin extends CryptoBase {
      * @return an X509 Certificate (chain) that corresponds to the identifier
      */
     private X509Certificate[] getX509Certificates(String identifier) throws WSSecurityException
{
+        if (identifier == null) {
+            return null;
+        }
         Certificate[] certs = null;
         try {
             if (keystore != null) {



Mime
View raw message