You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by re...@apache.org on 2013/03/26 16:19:05 UTC

svn commit: r1461183 - in /jackrabbit/branches/2.4: ./ jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/AbstractLocatorFactory.java

Author: reschke
Date: Tue Mar 26 15:19:05 2013
New Revision: 1461183

URL: http://svn.apache.org/r1461183
Log:
JCR-3540: fix href generation of RootCollection (ported to 2.4)

Modified:
    jackrabbit/branches/2.4/   (props changed)
    jackrabbit/branches/2.4/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/AbstractLocatorFactory.java

Propchange: jackrabbit/branches/2.4/
------------------------------------------------------------------------------
  Merged /jackrabbit/trunk:r1461137

Modified: jackrabbit/branches/2.4/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/AbstractLocatorFactory.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.4/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/AbstractLocatorFactory.java?rev=1461183&r1=1461182&r2=1461183&view=diff
==============================================================================
--- jackrabbit/branches/2.4/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/AbstractLocatorFactory.java (original)
+++ jackrabbit/branches/2.4/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/AbstractLocatorFactory.java Tue Mar 26 15:19:05 2013
@@ -231,10 +231,10 @@ public abstract class AbstractLocatorFac
                 buf.append(EncodeUtil.escapePath(resourcePath));
             }
             int length = buf.length();
-            if (length > 0 && buf.charAt(length - 1) != '/') {
+            if (length == 0 || (length > 0 && buf.charAt(length - 1) != '/')) {
                 buf.append("/");
             }
-            href = buf.toString();
+            this.href = buf.toString();
         }
 
         /**