NPE fix
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/b532444c Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/b532444c Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/b532444c Branch: refs/heads/3.0.x-fixes Commit: b532444cba8169ee5853ae6f31b6f200fea42f6e Parents: e9e7ff1 Author: Colm O hEigeartaigh <[email protected]> Authored: Thu Dec 3 14:47:19 2015 +0000 Committer: Colm O hEigeartaigh <[email protected]> Committed: Thu Dec 3 15:04:15 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/b532444c/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 8d399e9..5713855 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) {
