From f78735f84c4ad6fd014e07734630e004f26c4b85 Mon Sep 17 00:00:00 2001
From: Derek Hulley <derek.hulley@alfresco.com>
Date: Tue, 11 Sep 2007 03:39:41 +0000
Subject: [PATCH] Merged V2.1 to HEAD    6609: Portlet UI (doclist, myspaces,
 mytasks) updates following design review    6610: AR-1270    6611: debugging
 WCM-778.    6612: Improved API documentation.    6613: Added store lookup
 cache to EHCache config for default and extended cluster sample    6614:
 AWC-1531 and AWC-1146. Link objects that have targets which the user does not
 have access to are now filtered from the view.    6615: AR-1664: Bootstraping
 from full export fails if file names differs only with a space: my file, my
 file    6616: Fixed AR-1519: Possible duplicate entries when moving nodes
 between stores    6617: Removed deprecated aspects; Added emailed aspect to
 messages; Added OOo command line options    6618: Fix for AWC-1350    6619:
 Fix for AWC-1509    6620: AWC-1179: Searching for users in Invite User Wizard
 is slow with large number of users    6621: Changed shutdown logic to avoid
 classloader cleanup race.    6622: Fix for AWC-1533 (can't save office docs
 to Company Home)    6623: Fix for AR-1705    6624: Better fix for AWC-1256
 (links generated by tinyMCE editor)    6625: Fixed AR-1713: Transformers that
 do nothing don't break full text indexing    6626: Fixed AWC-1438: Added
 explcit TXT to PDF converter that wraps the PDFBox TextToPDF class    6627:
 Portlet templates now handle missing description property on web form   
 6628: Fix WCM-788    6635: Make workflow available for users who cannot see
 company home          Resolved conflicted state of
 'root\projects\repository\source\java\org\alfresco\repo\workflow\jbpm\JBPMEngine.java'

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6748 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../java/org/alfresco/repo/webdav/LockMethod.java  | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/source/java/org/alfresco/repo/webdav/LockMethod.java b/source/java/org/alfresco/repo/webdav/LockMethod.java
index 92b9260fca..0ad089663e 100644
--- a/source/java/org/alfresco/repo/webdav/LockMethod.java
+++ b/source/java/org/alfresco/repo/webdav/LockMethod.java
@@ -189,12 +189,24 @@ public class LockMethod extends WebDAVMethod
                 throw new WebDAVServerException(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
             }
             
+            FileInfo dirInfo = null;
             List<String> dirPathElements = getDAVHelper().splitAllPaths(splitPath[0]);
-            FileInfo dirInfo = fileFolderService.makeFolders(rootNodeRef, dirPathElements, ContentModel.TYPE_FOLDER);
+            if (dirPathElements.size() == 0)
+            {
+               // if there are no path elements we are at the root so get the root node
+               dirInfo = fileFolderService.getFileInfo(getRootNodeRef());
+            }
+            else
+            {
+               // make sure folder structure is present
+               dirInfo = fileFolderService.makeFolders(rootNodeRef, dirPathElements, ContentModel.TYPE_FOLDER);
+            }
+            
             if (dirInfo == null)
             {
                 throw new WebDAVServerException(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
             }
+            
             // create the file
             lockNodeInfo = fileFolderService.create(dirInfo.getNodeRef(), splitPath[1], ContentModel.TYPE_CONTENT);