Updated Branches: refs/heads/master c76f1b279 -> bb893f824
Fix the OBR relative URI support git-svn-id: https://svn.apache.org/repos/asf/karaf/sandbox/jbonofre/cave/trunk@1161420 13f79535-47bb-0310-9956-ffa450edef68 Project: http://git-wip-us.apache.org/repos/asf/karaf-cave/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf-cave/commit/1a567296 Tree: http://git-wip-us.apache.org/repos/asf/karaf-cave/tree/1a567296 Diff: http://git-wip-us.apache.org/repos/asf/karaf-cave/diff/1a567296 Branch: refs/heads/master Commit: 1a56729609f80e385297ae816953afac313118b8 Parents: 2bae6c0 Author: jbonofre <jbonofre@13f79535-47bb-0310-9956-ffa450edef68> Authored: Thu Aug 25 07:19:17 2011 +0000 Committer: jbonofre <jbonofre@13f79535-47bb-0310-9956-ffa450edef68> Committed: Thu Aug 25 07:19:17 2011 +0000 ---------------------------------------------------------------------- .../karaf/cave/server/backend/impl/CaveRepositoryImpl.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf-cave/blob/1a567296/server/backend/filesystem/src/main/java/org/apache/karaf/cave/server/backend/impl/CaveRepositoryImpl.java ---------------------------------------------------------------------- diff --git a/server/backend/filesystem/src/main/java/org/apache/karaf/cave/server/backend/impl/CaveRepositoryImpl.java b/server/backend/filesystem/src/main/java/org/apache/karaf/cave/server/backend/impl/CaveRepositoryImpl.java index 2366e4d..6c02c7e 100644 --- a/server/backend/filesystem/src/main/java/org/apache/karaf/cave/server/backend/impl/CaveRepositoryImpl.java +++ b/server/backend/filesystem/src/main/java/org/apache/karaf/cave/server/backend/impl/CaveRepositoryImpl.java @@ -372,9 +372,10 @@ public class CaveRepositoryImpl extends CaveRepository { */ private void useResourceRelativeUri(ResourceImpl resource) throws Exception { String resourceURI = resource.getURI(); - LOGGER.debug("Converting resource URI {} relatively to repository URI {}", resourceURI, this.getLocation()); - if (resourceURI.startsWith(this.getLocation())) { - resourceURI = resourceURI.substring(this.getLocation().length()); + String locationURI = "file:" + this.getLocation(); + LOGGER.debug("Converting resource URI {} relatively to repository URI {}", resourceURI, locationURI); + if (resourceURI.startsWith(locationURI)) { + resourceURI = resourceURI.substring(locationURI.length() + 1); LOGGER.debug("Resource URI converted to " + resourceURI); resource.put(Resource.URI, resourceURI); }
