Repository: cxf Updated Branches: refs/heads/3.0.x-fixes e4a296435 -> ceff09ecb
[CXF-6840] Updating SchemaHandler to correctly resolve with a null publicId, patch from Vjacheslav Borisov applied Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/ceff09ec Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/ceff09ec Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/ceff09ec Branch: refs/heads/3.0.x-fixes Commit: ceff09ecbd3639f21574fe60662ec17af04a867a Parents: e4a2964 Author: Sergey Beryozkin <[email protected]> Authored: Wed Mar 23 16:34:59 2016 +0300 Committer: Sergey Beryozkin <[email protected]> Committed: Wed Mar 23 16:38:09 2016 +0300 ---------------------------------------------------------------------- .../java/org/apache/cxf/jaxrs/utils/schemas/SchemaHandler.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/ceff09ec/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/schemas/SchemaHandler.java ---------------------------------------------------------------------- diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/schemas/SchemaHandler.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/schemas/SchemaHandler.java index f085535..ae67647 100644 --- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/schemas/SchemaHandler.java +++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/schemas/SchemaHandler.java @@ -129,7 +129,8 @@ public class SchemaHandler { resolvedLocation = catalogResolver.resolveURI(namespaceURI); } if (resolvedLocation == null) { - resolvedLocation = catalogResolver.resolvePublic(publicId, systemId); + resolvedLocation = catalogResolver.resolvePublic( + publicId != null ? publicId : namespaceURI, systemId); } if (resolvedLocation != null) { InputStream resourceStream =
