jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r389552 - /jackrabbit/branches/1.0/jcr-server/server/src/java/org/apache/jackrabbit/webdav/jcr/DavLocatorFactoryImpl.java
Date Tue, 28 Mar 2006 17:29:25 GMT
Author: jukka
Date: Tue Mar 28 09:29:22 2006
New Revision: 389552

URL: http://svn.apache.org/viewcvs?rev=389552&view=rev
Log:
1.0: Merged revision 387472: JCR-365 Web client/WebDAV fails to unescape workspace names

Modified:
    jackrabbit/branches/1.0/jcr-server/server/src/java/org/apache/jackrabbit/webdav/jcr/DavLocatorFactoryImpl.java

Modified: jackrabbit/branches/1.0/jcr-server/server/src/java/org/apache/jackrabbit/webdav/jcr/DavLocatorFactoryImpl.java
URL: http://svn.apache.org/viewcvs/jackrabbit/branches/1.0/jcr-server/server/src/java/org/apache/jackrabbit/webdav/jcr/DavLocatorFactoryImpl.java?rev=389552&r1=389551&r2=389552&view=diff
==============================================================================
--- jackrabbit/branches/1.0/jcr-server/server/src/java/org/apache/jackrabbit/webdav/jcr/DavLocatorFactoryImpl.java
(original)
+++ jackrabbit/branches/1.0/jcr-server/server/src/java/org/apache/jackrabbit/webdav/jcr/DavLocatorFactoryImpl.java
Tue Mar 28 09:29:22 2006
@@ -95,12 +95,12 @@
             if (pos == -1) {
                 // request to a 'workspace' resource that in the same time
                 // represent the root node of the repository.
-                workspacePath = href;
+                workspacePath = Text.unescape(href);
                 resourcePath = ItemResourceConstants.ROOT_ITEM_PATH;
             } else {
                 // separate the workspace name from the path of the repository
                 // item.
-                workspacePath = href.substring(0, pos);
+                workspacePath = Text.unescape(href.substring(0, pos));
                 resourcePath = Text.unescape(href.substring(pos));
             }
         }
@@ -163,7 +163,7 @@
 
             StringBuffer buf = new StringBuffer(prefix);
             if (workspacePath != null) {
-                buf.append(workspacePath);
+                buf.append(Text.escapePath(workspacePath));
             }
             if (resourcePath != null) {
                 buf.append(Text.escapePath(resourcePath));



Mime
View raw message