cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject svn commit: r1557197 - /cxf/branches/2.6.x-fixes/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/common/TrustValidator.java
Date Fri, 10 Jan 2014 17:01:42 GMT
Author: coheigea
Date: Fri Jan 10 17:01:42 2014
New Revision: 1557197

URL: http://svn.apache.org/r1557197
Log:
Merged revisions 1557189 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes

........
  r1557189 | coheigea | 2014-01-10 16:51:15 +0000 (Fri, 10 Jan 2014) | 10 lines

  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.6.x-fixes/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/common/TrustValidator.java

Modified: cxf/branches/2.6.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.6.x-fixes/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/common/TrustValidator.java?rev=1557197&r1=1557196&r2=1557197&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/common/TrustValidator.java
(original)
+++ cxf/branches/2.6.x-fixes/rt/rs/security/xml/src/main/java/org/apache/cxf/rs/security/common/TrustValidator.java
Fri Jan 10 17:01:42 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);
     }
 }



Mime
View raw message