Repository: cxf Updated Branches: refs/heads/master 5f4317c54 -> 1b01938aa
[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/1b01938a Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/1b01938a Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/1b01938a Branch: refs/heads/master Commit: 1b01938aab9eb555921f0eea3dcda33902c746dc Parents: 5f4317c Author: Sergey Beryozkin <[email protected]> Authored: Wed Mar 23 16:34:59 2016 +0300 Committer: Sergey Beryozkin <[email protected]> Committed: Wed Mar 23 16:34:59 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/1b01938a/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 =
