From 38c103e17b7e0b277569e9973cdfd119bad297d8 Mon Sep 17 00:00:00 2001 From: Jan Vonka Date: Mon, 3 Sep 2007 14:24:54 +0000 Subject: [PATCH] Fix for tenant-specific WebDAV (fix for r6634) git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6666 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- source/java/org/alfresco/repo/webdav/WebDAVServlet.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/source/java/org/alfresco/repo/webdav/WebDAVServlet.java b/source/java/org/alfresco/repo/webdav/WebDAVServlet.java index 3e0039ca69..94af463f75 100644 --- a/source/java/org/alfresco/repo/webdav/WebDAVServlet.java +++ b/source/java/org/alfresco/repo/webdav/WebDAVServlet.java @@ -221,7 +221,7 @@ public class WebDAVServlet extends HttpServlet // Create the handler method method = (WebDAVMethod) methodClass.newInstance(); - NodeRef rootNodeRef = null; + NodeRef rootNodeRef = m_rootNodeRef; if (m_tenantService.isEnabled()) { WebApplicationContext context = WebApplicationContextUtils.getRequiredWebApplicationContext(getServletContext()); @@ -229,12 +229,9 @@ public class WebDAVServlet extends HttpServlet SearchService searchService = (SearchService) context.getBean("SearchService"); NamespaceService namespaceService = (NamespaceService) context.getBean("NamespaceService"); + // note: rootNodeRef is required (for storeRef part) rootNodeRef = m_tenantService.getRootNode(nodeService, searchService, namespaceService, m_rootPath, rootNodeRef); } - else - { - rootNodeRef = m_rootNodeRef; - } method.setDetails(request, response, m_davHelper, rootNodeRef); }