svn commit: r1557189 - /cxf/branches/2.7.x-fixes/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/common/TrustValidator.java

[coheigea]

Author: coheigea
Date: Fri Jan 10 16:51:15 2014
New Revision: 1557189

URL: http://svn.apache.org/r1557189
Log:
Merged revisions 1557187 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1557187 | coheigea | 2014-01-10 16:47:47 +0000 (Fri, 10 Jan 2014) | 2 lines

  Potential NPE fix

........

Modified:
    
cxf/branches/2.7.x-fixes/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/common/TrustValidator.java

Modified: 
cxf/branches/2.7.x-fixes/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/common/TrustValidator.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/common/TrustValidator.java?rev=1557189&r1=1557188&r2=1557189&view=diff
==============================================================================
--- 
cxf/branches/2.7.x-fixes/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/common/TrustValidator.java
 (original)
+++ 
cxf/branches/2.7.x-fixes/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/common/TrustValidator.java
 Fri Jan 10 16:51:15 2014
@@ -36,7 +36,9 @@ public class TrustValidator {
         
         Credential trustCredential = new Credential();
         trustCredential.setPublicKey(publicKey);
-        trustCredential.setCertificates(new X509Certificate[]{cert});
+        if (cert != null) {
+            trustCredential.setCertificates(new X509Certificate[]{cert});
+        }
         validator.validate(trustCredential, data);
     }
 }