You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by as...@apache.org on 2015/07/24 17:42:28 UTC
[1/2] cxf git commit: [CXF-6392] Prevent NPE
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes 88ad79a57 -> 1caca0f66
[CXF-6392] Prevent NPE
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/07e3230d
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/07e3230d
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/07e3230d
Branch: refs/heads/3.0.x-fixes
Commit: 07e3230db86ff44f5838315f7ca20f6f69f647c7
Parents: 88ad79a
Author: Alessio Soldano <as...@redhat.com>
Authored: Fri Jul 24 17:30:28 2015 +0200
Committer: Alessio Soldano <as...@redhat.com>
Committed: Fri Jul 24 17:40:48 2015 +0200
----------------------------------------------------------------------
.../simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/07e3230d/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java
----------------------------------------------------------------------
diff --git a/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java b/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java
index e522301..95d0197 100644
--- a/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java
+++ b/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java
@@ -174,7 +174,7 @@ public class WSDLGetUtils {
if (!smp.containsKey(URLDecoder.decode(key, "utf-8"))) {
// if the result is not known, check if we can resolve it into something known
String resolved = resolveWithCatalogs(OASISCatalogManager.getCatalogManager(bus), key, base);
- if (smp.containsKey(URLDecoder.decode(resolved, "utf-8"))) {
+ if (resolved != null && smp.containsKey(URLDecoder.decode(resolved, "utf-8"))) {
// if it is resolvable, we can use it
return base + "?xsd=" + key.replace(" ", "%20");
}
[2/2] cxf git commit: Recording .gitmergeinfo Changes
Posted by as...@apache.org.
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/1caca0f6
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/1caca0f6
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/1caca0f6
Branch: refs/heads/3.0.x-fixes
Commit: 1caca0f66b64d7aaa509b1dd6fb38b4bcb981183
Parents: 07e3230
Author: Alessio Soldano <as...@redhat.com>
Authored: Fri Jul 24 17:41:17 2015 +0200
Committer: Alessio Soldano <as...@redhat.com>
Committed: Fri Jul 24 17:41:17 2015 +0200
----------------------------------------------------------------------
.gitmergeinfo | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/1caca0f6/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 3016e0a..e3ee031 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -478,6 +478,7 @@ M 7b4cb818cb6276dfd3a7432c796e67e98c8c941e
M 7bf10fc3fb018d533409cc444c2d7b75144b9e23
M 816e1a5ef4c0992a7d084a0529e42d9ad6a4a3c6
M 81f0b461d662eccd23ac5ade7349eecdc0316ddf
+M 81f3a848e30751f52be6e4d694e3522f77a14b50
M 824234e627f6205129b7f97e2fde7f1cf1f17093
M 865eb64d44fd4e904f166cb03b0d15ca8b5f0ba5
M 88a7cd850f0471d6e51f9045bf01f775a905cbf2