Author: coheigea
Date: Wed Oct  5 08:56:29 2011
New Revision: 1179111

URL: http://svn.apache.org/viewvc?rev=1179111&view=rev
Log:
[WSS-319] - NPE when certificate identified by SKI can't be found
 - Patch applied, thanks

Modified:
    
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/message/token/SecurityTokenReference.java

Modified: 
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/message/token/SecurityTokenReference.java
URL: 
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/main/java/org/apache/ws/security/message/token/SecurityTokenReference.java?rev=1179111&r1=1179110&r2=1179111&view=diff
==============================================================================
--- 
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/message/token/SecurityTokenReference.java
 (original)
+++ 
webservices/wss4j/trunk/src/main/java/org/apache/ws/security/message/token/SecurityTokenReference.java
 Wed Oct  5 08:56:29 2011
@@ -483,7 +483,9 @@ public class SecurityTokenReference {
             }
         } else if (SKI_URI.equals(value)) {
             X509Certificate cert = getX509SKIAlias(crypto);
-            return new X509Certificate[]{cert};
+            if (cert != null) {
+                return new X509Certificate[]{cert};
+            }
         } else if (THUMB_URI.equals(value)) {
             Node node = getFirstElement().getFirstChild();
             if (node == null) {


Reply via email to