NPE fix if the resource can't be loaded # Conflicts: # rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/common/JoseUtils.java
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/55652b5e Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/55652b5e Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/55652b5e Branch: refs/heads/3.0.x-fixes Commit: 55652b5edc85d8c7cdb23c5be20545a6c57b7229 Parents: 68229c8 Author: Colm O hEigeartaigh <[email protected]> Authored: Fri Jun 9 12:39:53 2017 +0100 Committer: Colm O hEigeartaigh <[email protected]> Committed: Fri Jun 9 12:45:03 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/55652b5e/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 4649517..f227a84 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 @@ -201,6 +201,9 @@ public final class JoseUtils { public static Properties loadProperties(String propertiesLocation, Bus bus) throws Exception { Properties props = new Properties(); InputStream is = getResourceStream(propertiesLocation, bus); + if (is == null) { + throw new JoseException("The properties file " + propertiesLocation + " could not be read"); + } props.load(is); return props; }
