cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject [2/2] cxf git commit: NPE fix
Date Thu, 03 Dec 2015 14:47:49 GMT
NPE fix


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/a056d558
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/a056d558
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/a056d558

Branch: refs/heads/master
Commit: a056d558cb8bb4e4b4f513b5a5955c98607f9e18
Parents: 9d6d943
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Thu Dec 3 14:47:19 2015 +0000
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Thu Dec 3 14:47:19 2015 +0000

----------------------------------------------------------------------
 .../apache/cxf/rs/security/jose/common/KeyManagementUtils.java    | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/a056d558/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/common/KeyManagementUtils.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/common/KeyManagementUtils.java
b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/common/KeyManagementUtils.java
index 79b1aed..4ca6ef9 100644
--- a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/common/KeyManagementUtils.java
+++ b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/common/KeyManagementUtils.java
@@ -95,6 +95,9 @@ public final class KeyManagementUtils {
         return loadX509CertificateOrChain(keyStore, alias);
     }
     private static X509Certificate[] loadX509CertificateOrChain(KeyStore keyStore, String
alias) {
+        if (alias == null) {
+            throw new JoseException("No alias supplied");
+        }
         try {
             Certificate[] certs = keyStore.getCertificateChain(alias);
             if (certs != null) {


Mime
View raw message