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 <asold...@redhat.com> Authored: Fri Jul 24 17:30:28 2015 +0200 Committer: Alessio Soldano <asold...@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"); }
