Updated Branches: refs/heads/camel-2.11.x 3b8544550 -> 14a73886d refs/heads/master d6aa78289 -> 7b995ad9a
CAMEL-6572 fixed loading the schema from bundle issue Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7b995ad9 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7b995ad9 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7b995ad9 Branch: refs/heads/master Commit: 7b995ad9a57530fdf1a29f49a7a13b8e0dd38e22 Parents: d6aa782 Author: Willem Jiang <ningji...@apache.org> Authored: Tue Jul 30 20:48:49 2013 +0800 Committer: Willem Jiang <ningji...@apache.org> Committed: Tue Jul 30 20:50:54 2013 +0800 ---------------------------------------------------------------------- .../camel/component/validator/DefaultLSResourceResolver.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/7b995ad9/camel-core/src/main/java/org/apache/camel/component/validator/DefaultLSResourceResolver.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/component/validator/DefaultLSResourceResolver.java b/camel-core/src/main/java/org/apache/camel/component/validator/DefaultLSResourceResolver.java index 86db2e8..622e257 100644 --- a/camel-core/src/main/java/org/apache/camel/component/validator/DefaultLSResourceResolver.java +++ b/camel-core/src/main/java/org/apache/camel/component/validator/DefaultLSResourceResolver.java @@ -65,7 +65,7 @@ public class DefaultLSResourceResolver implements LSResourceResolver { String resourceURI = null; // Build up the relative path for using relatedURI and baseURI if (baseURI == null) { - relatedURI = getUri(systemId); + relatedURI = FileUtil.compactPath(getUri(systemId), '/'); resourceURI = relatedURI; } else { String relatedPath = relatedURIMap.get(baseURI); @@ -74,11 +74,11 @@ public class DefaultLSResourceResolver implements LSResourceResolver { if (relatedPath == null) { relatedPath = ""; } - relatedURI = FileUtil.onlyPath(relatedURI) + "/" + systemId; + relatedURI = FileUtil.compactPath(FileUtil.onlyPath(relatedURI) + "/" + systemId, '/'); resourceURI = relatedURI; relatedURIMap.put(baseURI, relatedPath); } else { - resourceURI = relatedPath + "/" + systemId; + resourceURI = FileUtil.compactPath(relatedPath + "/" + systemId, '/'); relatedURI = resourceURI; } }
