JCR-2920: Workspace.copy(src, dest) throws unexpected RepositoryExcep…

…tion ("Invalid path") git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/trunk@1082620 13f79535-47bb-0310-9956-ffa450edef68
uwej711 · Mar 17, 2011 · 6261420 · 6261420
1 parent 2f7a515
commit 6261420
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/RepositoryServiceImpl.java b/jackrabbit-spi2dav/src/main/java/org/apache/jackrabbit/spi2dav/RepositoryServiceImpl.java
@@ -410,7 +410,11 @@ private String getItemUri(NodeId parentId, Name childName,
                               SessionInfo sessionInfo) throws RepositoryException {
         String parentUri = uriResolver.getItemUri(parentId, sessionInfo.getWorkspaceName(), sessionInfo);
         NamePathResolver resolver = getNamePathResolver(sessionInfo);
-        return parentUri + "/" + Text.escape(resolver.getJCRName(childName));
+        // JCR-2920: don't append '/' to a trailing '/'
+        if (!parentUri.endsWith("/")) {
+            parentUri += "/";
+        }
+        return parentUri + Text.escape(resolver.getJCRName(childName));
     }
 
     private NodeId getParentId(DavPropertySet propSet, SessionInfo sessionInfo)