camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject [2/2] git commit: CAMEL-6572 fixed loading the schema from bundle issue
Date Tue, 30 Jul 2013 12:58:09 GMT
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/14a73886
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/14a73886
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/14a73886

Branch: refs/heads/camel-2.11.x
Commit: 14a73886dbd1bed4c9b79982ae9dea26ae7d2738
Parents: 3b85445
Author: Willem Jiang <ningjiang@apache.org>
Authored: Tue Jul 30 20:48:49 2013 +0800
Committer: Willem Jiang <ningjiang@apache.org>
Committed: Tue Jul 30 20:57:13 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/14a73886/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;
             }
         }


Mime
View raw message