You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2017/06/09 11:53:33 UTC
[1/2] cxf git commit: Recording .gitmergeinfo Changes
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes 68229c88f -> b2f183c02
Recording .gitmergeinfo Changes
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/b2f183c0
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/b2f183c0
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/b2f183c0
Branch: refs/heads/3.0.x-fixes
Commit: b2f183c02600f3a9519962057e074e5177230c97
Parents: 55652b5
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Fri Jun 9 12:45:03 2017 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Fri Jun 9 12:45:03 2017 +0100
----------------------------------------------------------------------
.gitmergeinfo | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/b2f183c0/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 8137742..84defcd 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -1773,6 +1773,7 @@ M 00a5a1d6b1da5f3b679c25d4bd988d1277ee62e7
M 00b626af504d3d59419ec2d1eb5e39943ec5b8aa
M 011725e4de2026bbebb6a732764a86d9a2ae4109
M 01860c78f6fd7554cf89a9bc912ca78d2b304efe
+M 02221113b4c85bc643f18c82a7d59e0179d400ac
M 049fe48c0489cf0e4df632a73bb91a76343d2639
M 0529afb26222feaf5e3954518a8e3bfacd857829
M 05383ffcfc3fe16c6acadf1a343375c00fa1116c
[2/2] cxf git commit: NPE fix if the resource can't be loaded
Posted by co...@apache.org.
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 <co...@apache.org>
Authored: Fri Jun 9 12:39:53 2017 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
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;
}