Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 9228E200C8F for ; Fri, 9 Jun 2017 13:40:06 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 90B35160BC8; Fri, 9 Jun 2017 11:40:06 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id D74B0160B9C for ; Fri, 9 Jun 2017 13:40:05 +0200 (CEST) Received: (qmail 13707 invoked by uid 500); 9 Jun 2017 11:40:05 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 13692 invoked by uid 99); 9 Jun 2017 11:40:04 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 09 Jun 2017 11:40:04 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 808A7DFE61; Fri, 9 Jun 2017 11:40:04 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: coheigea@apache.org To: commits@cxf.apache.org Message-Id: <043ac672e02f4e009580807dfa42fd71@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: cxf git commit: NPE fix if the resource can't be loaded Date: Fri, 9 Jun 2017 11:40:04 +0000 (UTC) archived-at: Fri, 09 Jun 2017 11:40:06 -0000 Repository: cxf Updated Branches: refs/heads/master 089ba5825 -> aaa8fde1e NPE fix if the resource can't be loaded Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/aaa8fde1 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/aaa8fde1 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/aaa8fde1 Branch: refs/heads/master Commit: aaa8fde1e631c53252d822d4ff24689f186cc668 Parents: 089ba58 Author: Colm O hEigeartaigh Authored: Fri Jun 9 12:39:53 2017 +0100 Committer: Colm O hEigeartaigh Committed: Fri Jun 9 12:39:53 2017 +0100 ---------------------------------------------------------------------- .../java/org/apache/cxf/rs/security/jose/common/JoseUtils.java | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/aaa8fde1/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/common/JoseUtils.java ---------------------------------------------------------------------- diff --git a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/common/JoseUtils.java b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/common/JoseUtils.java index d9b7281..428c775 100644 --- a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/common/JoseUtils.java +++ b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/common/JoseUtils.java @@ -196,6 +196,9 @@ public final class JoseUtils { public static Properties loadProperties(String propertiesLocation, Bus bus) throws Exception { Properties props = new Properties(); try (InputStream is = getResourceStream(propertiesLocation, bus)) { + if (is == null) { + throw new JoseException("The properties file " + propertiesLocation + " could not be read"); + } props.load(is); } return props;