From e57a636bc3ba363f49230418d64aa73866711ecb Mon Sep 17 00:00:00 2001 From: Kevin Roast Date: Mon, 4 Dec 2006 11:39:37 +0000 Subject: [PATCH] . Fix to WebDav name based path resolving util method - now correctly handles Company Home root case git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4506 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../org/alfresco/web/app/servlet/BaseServlet.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/source/java/org/alfresco/web/app/servlet/BaseServlet.java b/source/java/org/alfresco/web/app/servlet/BaseServlet.java index 42dde0bf53..9b7930af6d 100644 --- a/source/java/org/alfresco/web/app/servlet/BaseServlet.java +++ b/source/java/org/alfresco/web/app/servlet/BaseServlet.java @@ -244,7 +244,7 @@ public abstract class BaseServlet extends HttpServlet { NodeRef nodeRef = null; - List paths = new ArrayList(args.length-1); + List paths = new ArrayList(args.length - 1); FileInfo file = null; try @@ -259,12 +259,14 @@ public abstract class BaseServlet extends HttpServlet logger.debug("Attempting to resolve webdav path: " + paths); // get the company home node to start the search from - NodeRef companyHome = new NodeRef(Repository.getStoreRef(), - Application.getCompanyRootId()); + nodeRef = new NodeRef(Repository.getStoreRef(), Application.getCompanyRootId()); - FileFolderService ffs = (FileFolderService)wc.getBean("FileFolderService"); - file = ffs.resolveNamePath(companyHome, paths); - nodeRef = file.getNodeRef(); + if (paths.size() != 0) + { + FileFolderService ffs = (FileFolderService)wc.getBean("FileFolderService"); + file = ffs.resolveNamePath(nodeRef, paths); + nodeRef = file.getNodeRef(); + } if (logger.isDebugEnabled()) logger.debug("Resolved webdav path to NodeRef: " + nodeRef);