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:31:07 UTC
cxf git commit: [CXF-6392] Prevent NPE
Repository: cxf
Updated Branches:
refs/heads/master b1ea93904 -> 81f3a848e
[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/81f3a848
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/81f3a848
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/81f3a848
Branch: refs/heads/master
Commit: 81f3a848e30751f52be6e4d694e3522f77a14b50
Parents: b1ea939
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:30:28 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/81f3a848/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");
}