From 52b135f8c694105c69dcc26df684bd9b1fb8aa79 Mon Sep 17 00:00:00 2001
From: Dave Ward <left@alfresco.com>
Date: Tue, 21 Aug 2012 16:40:47 +0000
Subject: [PATCH] ALF-15567: Fixed merge issue

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@40694 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 source/java/org/alfresco/repo/webdav/GetMethod.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/source/java/org/alfresco/repo/webdav/GetMethod.java b/source/java/org/alfresco/repo/webdav/GetMethod.java
index 609757e45e..cb33888a8d 100644
--- a/source/java/org/alfresco/repo/webdav/GetMethod.java
+++ b/source/java/org/alfresco/repo/webdav/GetMethod.java
@@ -186,8 +186,8 @@ public class GetMethod extends WebDAVMethod
             {
                 pathToNode = pathToNode.subPath(2, pathToNode.size() -1);
             }
-           
-            String rootURL = WebDAV.getURLForPath(m_request, pathToNode.toDisplayPath(getNodeService(), getPermissionService()), true);
+
+            String rootURL = getDAVHelper().getURLForPath(m_request, pathToNode.toDisplayPath(getNodeService(), getPermissionService()), true);
             if (rootURL.endsWith(WebDAVHelper.PathSeperator) == false)
             {
                 rootURL = rootURL + WebDAVHelper.PathSeperator;