You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2011/08/25 09:19:17 UTC

svn commit: r1161420 - /karaf/sandbox/jbonofre/cave/trunk/server/backend/filesystem/src/main/java/org/apache/karaf/cave/server/backend/impl/CaveRepositoryImpl.java

Author: jbonofre
Date: Thu Aug 25 07:19:17 2011
New Revision: 1161420

URL: http://svn.apache.org/viewvc?rev=1161420&view=rev
Log:
Fix the OBR relative URI support

Modified:
    karaf/sandbox/jbonofre/cave/trunk/server/backend/filesystem/src/main/java/org/apache/karaf/cave/server/backend/impl/CaveRepositoryImpl.java

Modified: karaf/sandbox/jbonofre/cave/trunk/server/backend/filesystem/src/main/java/org/apache/karaf/cave/server/backend/impl/CaveRepositoryImpl.java
URL: http://svn.apache.org/viewvc/karaf/sandbox/jbonofre/cave/trunk/server/backend/filesystem/src/main/java/org/apache/karaf/cave/server/backend/impl/CaveRepositoryImpl.java?rev=1161420&r1=1161419&r2=1161420&view=diff
==============================================================================
--- karaf/sandbox/jbonofre/cave/trunk/server/backend/filesystem/src/main/java/org/apache/karaf/cave/server/backend/impl/CaveRepositoryImpl.java (original)
+++ karaf/sandbox/jbonofre/cave/trunk/server/backend/filesystem/src/main/java/org/apache/karaf/cave/server/backend/impl/CaveRepositoryImpl.java Thu Aug 25 07:19:17 2011
@@ -372,9 +372,10 @@ public class CaveRepositoryImpl extends 
      */
     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);
         }