Repository: cxf Updated Branches: refs/heads/2.7.x-fixes 19b3e261f -> 218e5a959
[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/90a5982a Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/90a5982a Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/90a5982a Branch: refs/heads/2.7.x-fixes Commit: 90a5982a52bd74b49e485f4985dffac4ac0cdf64 Parents: 19b3e26 Author: Alessio Soldano <[email protected]> Authored: Fri Jul 24 17:30:28 2015 +0200 Committer: Alessio Soldano <[email protected]> Committed: Fri Jul 24 17:43:02 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/90a5982a/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 bab0a60..7b17ed6 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 @@ -175,7 +175,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"); }
