Repository: cxf Updated Branches: refs/heads/3.1.x-fixes e4de49b41 -> 6ba1945be
[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/6ba1945b Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/6ba1945b Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/6ba1945b Branch: refs/heads/3.1.x-fixes Commit: 6ba1945bef8931568497afadf9af4d07f0cd6fec Parents: e4de49b Author: Sergey Beryozkin <[email protected]> Authored: Wed Mar 23 16:34:59 2016 +0300 Committer: Sergey Beryozkin <[email protected]> Committed: Wed Mar 23 16:36:32 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/6ba1945b/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 5a97297..da70a19 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 @@ -130,7 +130,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 =
